diff -Nru vinagre-2.26.1/aclocal.m4 vinagre-2.29.1/aclocal.m4 --- vinagre-2.26.1/aclocal.m4 2009-03-19 19:38:04.000000000 +0000 +++ vinagre-2.29.1/aclocal.m4 2009-10-26 12:12:34.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +[m4_warning([this file was generated for autoconf 2.64. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -55,10 +55,11 @@ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) AC_ARG_ENABLE(schemas-install, - [ --disable-schemas-install Disable the schemas installation], + AC_HELP_STRING([--disable-schemas-install], + [Disable the schemas installation]), [case ${enableval} in yes|no) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; esac]) AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ]) @@ -676,15 +677,19 @@ # GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) # AC_DEFUN([GNOME_DOC_INIT], -[ +[AC_REQUIRE([AC_PROG_LN_S])dnl + ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) +AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) if test "$gdu_cv_have_gdu" = "yes"; then + AC_MSG_RESULT([yes]) ifelse([$2],,[:],[$2]) else + AC_MSG_RESULT([no]) ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) fi @@ -745,25 +750,25 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) -AC_SUBST(INTLTOOL_KEYS_RULE) -AC_SUBST(INTLTOOL_PROP_RULE) -AC_SUBST(INTLTOOL_OAF_RULE) -AC_SUBST(INTLTOOL_PONG_RULE) -AC_SUBST(INTLTOOL_SERVER_RULE) -AC_SUBST(INTLTOOL_SHEET_RULE) -AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -AC_SUBST(INTLTOOL_UI_RULE) -AC_SUBST(INTLTOOL_XAM_RULE) -AC_SUBST(INTLTOOL_KBD_RULE) -AC_SUBST(INTLTOOL_XML_RULE) -AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -AC_SUBST(INTLTOOL_CAVES_RULE) -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) -AC_SUBST(INTLTOOL_SERVICE_RULE) -AC_SUBST(INTLTOOL_POLICY_RULE) +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) # Check the gettext tools to make sure they are GNU AC_PATH_PROG(XGETTEXT, xgettext) @@ -780,12 +785,17 @@ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi -AC_PATH_PROG(INTLTOOL_PERL, [perl]) +AC_PATH_PROG(INTLTOOL_PERL, perl) if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found; required for intltool]) + AC_MSG_ERROR([perl not found]) fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - AC_MSG_ERROR([perl 5.x required for intltool]) +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then AC_MSG_CHECKING([for XML::Parser]) @@ -841,7 +851,7 @@ dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) fi rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" @@ -863,6 +873,17 @@ ])dnl ]) +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + # deprecated macros AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # A hint is needed for aclocal from Automake <= 1.9.4: @@ -1245,12 +1266,12 @@ # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) # --------------------------------------------------- m4_define([lt_decl_varnames_tagged], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_quote(m4_if([$2], [], - m4_quote(lt_decl_tag_varnames), - m4_quote(m4_shift($@)))), - m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) -m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)]) +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) # lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) @@ -1810,10 +1831,10 @@ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on + darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? + # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -1855,7 +1876,11 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)='' _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - if test "$GCC" = "yes"; then + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=echo _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" @@ -2377,7 +2402,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, @@ -2545,10 +2570,6 @@ # endif #endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif - void fnord() { int i=42;} int main () { @@ -2564,7 +2585,7 @@ else puts (dlerror ()); - exit (status); + return status; }] _LT_EOF if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then @@ -2603,7 +2624,7 @@ lt_cv_dlopen_self=yes ;; - mingw* | pw32*) + mingw* | pw32* | cegcc*) lt_cv_dlopen="LoadLibrary" lt_cv_dlopen_libs= ;; @@ -2900,6 +2921,7 @@ [AC_REQUIRE([AC_CANONICAL_HOST])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], @@ -3064,14 +3086,14 @@ # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) version_type=windows shrext_cmds=".dll" need_version=no need_lib_prefix=no case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -3094,7 +3116,7 @@ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; - mingw*) + mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` @@ -3532,7 +3554,7 @@ version_type=linux need_lib_prefix=no need_version=no - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -3556,7 +3578,7 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi - + if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" fi @@ -3833,6 +3855,7 @@ # -- PORTME fill in with the dynamic library characteristics m4_defun([_LT_CHECK_MAGIC_METHOD], [m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) AC_CACHE_CHECK([how to recognize dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -3883,6 +3906,12 @@ fi ;; +cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; @@ -4194,7 +4223,7 @@ aix*) symcode='[[BCDT]]' ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) symcode='[[ABCDGISTW]]' ;; hpux*) @@ -4440,7 +4469,7 @@ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | cygwin* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -4467,10 +4496,11 @@ fi ;; hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) + hppa*64*) ;; *) _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' @@ -4568,12 +4598,19 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc* | ecpc* ) - # Intel C++ + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgCC* | pgcpp*) # Portland Group C++ compiler _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4739,7 +4776,7 @@ # PIC is the default for these OSes. ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -4755,10 +4792,11 @@ ;; hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) + hppa*64*) # +Z the default ;; *) @@ -4808,7 +4846,7 @@ fi ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], @@ -4839,11 +4877,25 @@ linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc* | ifort*) + # old Intel for x86_64 which still supported -KPIC. + ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -5025,7 +5077,7 @@ pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; linux* | k*bsd*-gnu) @@ -5080,7 +5132,7 @@ extract_expsyms_cmds= case $host_os in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -5095,6 +5147,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5167,7 +5222,7 @@ fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' @@ -5233,6 +5288,9 @@ tmp_addflag=' -i_dynamic -nofor_main' ;; ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; @@ -5465,6 +5523,7 @@ fi fi + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5519,7 +5578,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -5623,7 +5682,7 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -6404,6 +6463,7 @@ fi fi + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. @@ -6462,7 +6522,7 @@ esac ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' @@ -7843,6 +7903,18 @@ ]) +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates @@ -8303,7 +8375,7 @@ [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -8544,14 +8616,14 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Gary V. Vaughan, 2004 +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 5 ltsugar.m4 +# serial 6 ltsugar.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) @@ -8607,14 +8679,14 @@ # Produce a SEP delimited list of all paired combinations of elements of # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list # has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. m4_define([lt_combine], -[m4_if([$2], [], [], - [m4_if([$4], [], [], - [lt_join(m4_quote(m4_default([$1], [[, ]])), - lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], - [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), - [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl -]) +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) @@ -8677,15 +8749,15 @@ # Generated from ltversion.in. -# serial 2976 ltversion.m4 +# serial 3012 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.4]) -m4_define([LT_PACKAGE_REVISION], [1.2976]) +m4_define([LT_PACKAGE_VERSION], [2.2.6]) +m4_define([LT_PACKAGE_REVISION], [1.3012]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.4' -macro_revision='1.2976' +[macro_version='2.2.6' +macro_revision='1.3012' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) @@ -8973,7 +9045,7 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8985,10 +9057,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' +[am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.11], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9002,12 +9074,12 @@ # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl +[AM_AUTOMAKE_VERSION([1.11])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -9087,14 +9159,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -9107,6 +9179,7 @@ AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -9120,14 +9193,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -9184,6 +9257,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -9201,7 +9284,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -9211,19 +9304,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -9280,57 +9377,68 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -9362,13 +9470,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 16 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -9385,7 +9493,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl +[AC_PREREQ([2.62])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -9436,8 +9544,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -9445,23 +9553,36 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -]) + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) + +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) # When config.status generates a header, we must update the stamp-h file. @@ -9485,7 +9606,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9496,7 +9617,14 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -9523,27 +9651,38 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl + AC_SUBST([MAINT])dnl ] ) @@ -9551,13 +9690,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -9566,7 +9705,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -9576,24 +9715,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -9601,14 +9740,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_PROG_CC_C_O # -------------- @@ -9620,8 +9759,9 @@ # FIXME: we rely on the cache variable name because # there is no other way. set dummy $CC -ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. # But if we don't then we get into trouble of one sort or another. @@ -9637,14 +9777,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -9661,7 +9801,14 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -9699,13 +9846,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -9722,7 +9869,7 @@ # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- @@ -9732,14 +9879,14 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_SANITY_CHECK # --------------- @@ -9748,16 +9895,29 @@ # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -9782,6 +9942,33 @@ fi AC_MSG_RESULT(yes)]) +# Copyright (C) 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -9810,18 +9997,25 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff -Nru vinagre-2.26.1/ChangeLog vinagre-2.29.1/ChangeLog --- vinagre-2.26.1/ChangeLog 2009-03-20 20:30:55.000000000 +0000 +++ vinagre-2.29.1/ChangeLog 2009-04-18 14:25:15.000000000 +0100 @@ -1,3 +1,9 @@ +2009-04-13 Jonh Wendell + + * configure.in: post-release bump version to 2.26.2 + +==================== 2.26.1 ======================= + 2009-03-20 Jonh Wendell * src/vinagre-bookmarks.[ch], diff -Nru vinagre-2.26.1/compile vinagre-2.29.1/compile --- vinagre-2.26.1/compile 2009-04-13 14:35:35.000000000 +0100 +++ vinagre-2.29.1/compile 2009-10-26 13:35:25.000000000 +0000 @@ -1,9 +1,10 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2005-05-14.22 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software +# Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,8 +18,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -103,13 +103,13 @@ fi # Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name +# Note: use `[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d while true; do if mkdir "$lockdir" >/dev/null 2>&1; then break @@ -138,5 +138,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru vinagre-2.26.1/config.guess vinagre-2.29.1/config.guess --- vinagre-2.26.1/config.guess 2009-04-13 14:35:35.000000000 +0100 +++ vinagre-2.29.1/config.guess 2009-10-26 13:35:25.000000000 +0000 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-23' +timestamp='2009-04-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -324,6 +324,9 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -331,7 +334,20 @@ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -796,7 +812,7 @@ x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -935,6 +951,9 @@ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -985,9 +1004,6 @@ a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1102,8 +1118,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1141,6 +1160,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1216,6 +1245,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1324,6 +1356,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru vinagre-2.26.1/config.h.in vinagre-2.29.1/config.h.in --- vinagre-2.26.1/config.h.in 2009-04-13 14:35:34.000000000 +0100 +++ vinagre-2.29.1/config.h.in 2009-10-26 13:35:24.000000000 +0000 @@ -51,6 +51,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H +/* Define if you have telepathy */ +#undef HAVE_TELEPATHY + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H @@ -76,6 +79,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -87,3 +93,6 @@ /* We want avahi support */ #undef VINAGRE_ENABLE_AVAHI + +/* We want ssh support */ +#undef VINAGRE_ENABLE_SSH diff -Nru vinagre-2.26.1/config.sub vinagre-2.29.1/config.sub --- vinagre-2.26.1/config.sub 2009-04-13 14:35:35.000000000 +0100 +++ vinagre-2.29.1/config.sub 2009-10-26 13:35:25.000000000 +0000 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-01-16' +timestamp='2009-04-17' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,6 +122,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -249,13 +250,16 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +272,7 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -277,7 +282,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -286,7 +291,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -329,14 +334,17 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +366,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -439,6 +447,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -459,6 +471,10 @@ basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -526,6 +542,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1128,6 +1148,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1166,7 +1190,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1238,8 +1262,9 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1248,7 +1273,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1388,6 +1413,9 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) diff -Nru vinagre-2.26.1/configure vinagre-2.29.1/configure --- vinagre-2.26.1/configure 2009-03-19 19:38:08.000000000 +0000 +++ vinagre-2.29.1/configure 2009-10-26 12:12:36.000000000 +0000 @@ -1,62 +1,83 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for vinagre 2.26.1. +# Generated by GNU Autoconf 2.64 for vinagre 2.29.1. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +# Foundation, Inc. +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -65,20 +86,18 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -89,354 +108,322 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: http://projects.gnome.org/vinagre/ about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi -if ( set x; as_func_ret_success y && test x = "$1" ); then - : +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error -exitcode=0 -if as_func_success; then - : +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. + as_expr=false fi -if as_func_ret_success; then - : +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -453,8 +440,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -464,49 +450,40 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -514,7 +491,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -531,12 +508,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -551,7 +528,6 @@ - # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -718,14 +694,14 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='vinagre' PACKAGE_TARNAME='vinagre' -PACKAGE_VERSION='2.26.1' -PACKAGE_STRING='vinagre 2.26.1' +PACKAGE_VERSION='2.29.1' +PACKAGE_STRING='vinagre 2.29.1' PACKAGE_BUGREPORT='http://projects.gnome.org/vinagre/' +PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ @@ -763,189 +739,244 @@ # include #endif" -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +VINAGRE_PLUGINS_LIBS_DIR +VINAGRE_PLUGINS_DATA_DIR +LOADER_LIBTOOL_FLAGS +PLUGIN_LIBTOOL_FLAGS +VINAGRE_IMPLIB +ACTIVE_PLUGINS +REBUILD +PERL +GCONF_SCHEMAS_INSTALL_FALSE +GCONF_SCHEMAS_INSTALL_TRUE +GCONF_SCHEMA_FILE_DIR +GCONF_SCHEMA_CONFIG_SOURCE +GCONFTOOL +APPLET_FALSE +APPLET_TRUE +APPLET_LIBS +APPLET_CFLAGS +TELEPATHY_FALSE +TELEPATHY_TRUE +TELEPATHY_LIBS +TELEPATHY_CFLAGS +SSH_FALSE +SSH_TRUE +VTE_LIBS +VTE_CFLAGS +SSH_LIBS +SSH_CFLAGS +VNC_LIBS +VNC_CFLAGS +VINAGRE_LIBS +VINAGRE_CFLAGS +AVAHI_FALSE +AVAHI_TRUE +AVAHI_LIBS +AVAHI_CFLAGS +HAVE_GNOME_DOC_UTILS_FALSE +HAVE_GNOME_DOC_UTILS_TRUE +DISTCHECK_CONFIGURE_FLAGS +ENABLE_SK_FALSE +ENABLE_SK_TRUE +DOC_USER_FORMATS +OMF_DIR +HELP_DIR +PKG_CONFIG +MKINSTALLDIRS +POSUB +POFILES +PO_IN_DATADIR_FALSE +PO_IN_DATADIR_TRUE +INTLLIBS +INSTOBJEXT +GMOFILES +CATOBJEXT +CATALOGS +MSGFMT_OPTS +DATADIRNAME +ALL_LINGUAS +INTLTOOL_PERL +GMSGFMT +MSGFMT +MSGMERGE +XGETTEXT +INTLTOOL_POLICY_RULE +INTLTOOL_SERVICE_RULE +INTLTOOL_THEME_RULE +INTLTOOL_SCHEMAS_RULE +INTLTOOL_CAVES_RULE +INTLTOOL_XML_NOMERGE_RULE +INTLTOOL_XML_RULE +INTLTOOL_KBD_RULE +INTLTOOL_XAM_RULE +INTLTOOL_UI_RULE +INTLTOOL_SOUNDLIST_RULE +INTLTOOL_SHEET_RULE +INTLTOOL_SERVER_RULE +INTLTOOL_PONG_RULE +INTLTOOL_OAF_RULE +INTLTOOL_PROP_RULE +INTLTOOL_KEYS_RULE +INTLTOOL_DIRECTORY_RULE +INTLTOOL_DESKTOP_RULE +INTLTOOL_EXTRACT +INTLTOOL_MERGE +INTLTOOL_UPDATE +USE_NLS +GETTEXT_PACKAGE +WARN_CFLAGS +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +lt_ECHO +RANLIB +AR +OBJDUMP +LN_S +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +SED +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +LIBTOOL +EGREP +GREP +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +ACLOCAL_AMFLAGS +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +VINAGRE_API_VERSION +target_alias +host_alias build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_maintainer_mode +enable_silent_rules +enable_dependency_tracking +enable_static +enable_shared +with_pic +enable_fast_install +with_gnu_ld +enable_libtool_lock +enable_compile_warnings +enable_iso_c +enable_nls +with_help_dir +with_omf_dir +with_help_formats +enable_scrollkeeper +enable_avahi +enable_ssh +enable_telepathy +enable_applet +with_gconf_source +with_gconf_schema_file_dir +enable_schemas_install +enable_rebuilds +' + ac_precious_vars='build_alias host_alias target_alias -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -am__isrc -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar -MAINTAINER_MODE_TRUE -MAINTAINER_MODE_FALSE -MAINT -ACLOCAL_AMFLAGS CC CFLAGS LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -CPP -GREP -EGREP -LIBTOOL -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -SED -FGREP -LD -DUMPBIN -ac_ct_DUMPBIN -NM -LN_S -AR -RANLIB -lt_ECHO -DSYMUTIL -NMEDIT -LIPO -OTOOL -OTOOL64 -WARN_CFLAGS -GETTEXT_PACKAGE -USE_NLS -INTLTOOL_UPDATE -INTLTOOL_MERGE -INTLTOOL_EXTRACT -INTLTOOL_DESKTOP_RULE -INTLTOOL_DIRECTORY_RULE -INTLTOOL_KEYS_RULE -INTLTOOL_PROP_RULE -INTLTOOL_OAF_RULE -INTLTOOL_PONG_RULE -INTLTOOL_SERVER_RULE -INTLTOOL_SHEET_RULE -INTLTOOL_SOUNDLIST_RULE -INTLTOOL_UI_RULE -INTLTOOL_XAM_RULE -INTLTOOL_KBD_RULE -INTLTOOL_XML_RULE -INTLTOOL_XML_NOMERGE_RULE -INTLTOOL_CAVES_RULE -INTLTOOL_SCHEMAS_RULE -INTLTOOL_THEME_RULE -INTLTOOL_SERVICE_RULE -INTLTOOL_POLICY_RULE -XGETTEXT -MSGMERGE -MSGFMT -GMSGFMT -INTLTOOL_PERL -ALL_LINGUAS -DATADIRNAME -MSGFMT_OPTS -CATALOGS -CATOBJEXT -GMOFILES -INSTOBJEXT -INTLLIBS -PO_IN_DATADIR_TRUE -PO_IN_DATADIR_FALSE -POFILES -POSUB -MKINSTALLDIRS -PKG_CONFIG -HELP_DIR -OMF_DIR -DOC_USER_FORMATS -ENABLE_SK_TRUE -ENABLE_SK_FALSE -DISTCHECK_CONFIGURE_FLAGS -HAVE_GNOME_DOC_UTILS_TRUE -HAVE_GNOME_DOC_UTILS_FALSE -AVAHI_CFLAGS -AVAHI_LIBS -AVAHI_TRUE -AVAHI_FALSE -VINAGRE_CFLAGS -VINAGRE_LIBS -APPLET_CFLAGS -APPLET_LIBS -GCONFTOOL -GCONF_SCHEMA_CONFIG_SOURCE -GCONF_SCHEMA_FILE_DIR -GCONF_SCHEMAS_INSTALL_TRUE -GCONF_SCHEMAS_INSTALL_FALSE -PERL -REBUILD -LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS +LIBS CPPFLAGS CPP PKG_CONFIG @@ -953,6 +984,12 @@ AVAHI_LIBS VINAGRE_CFLAGS VINAGRE_LIBS +VNC_CFLAGS +VNC_LIBS +SSH_CFLAGS +SSH_LIBS +TELEPATHY_CFLAGS +TELEPATHY_LIBS APPLET_CFLAGS APPLET_LIBS' @@ -960,6 +997,8 @@ # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -1058,13 +1097,20 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -1077,13 +1123,20 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1274,22 +1327,36 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1309,25 +1376,25 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1336,23 +1403,36 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac fi -# Be sure to have absolute directory names. +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1366,7 +1446,7 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1382,23 +1462,21 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1425,13 +1503,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1457,7 +1533,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vinagre 2.26.1 to adapt to many kinds of systems. +\`configure' configures vinagre 2.29.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1479,9 +1555,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1491,25 +1567,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/vinagre] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/vinagre] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1527,19 +1603,22 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vinagre 2.26.1:";; + short | recursive ) echo "Configuration of vinagre 2.29.1:";; esac cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -1550,7 +1629,12 @@ --disable-scrollkeeper do not make updates to the scrollkeeper database --disable-avahi Do not use avahi for auto-discover machines default=no - --disable-schemas-install Disable the schemas installation + --enable-ssh Enable SSH plugin (default=no) + --enable-telepathy=[no/yes/auto] + Enable telepathy checking + --disable-applet Do not build the panel applet [default=enabled] + --disable-schemas-install + Disable the schemas installation --disable-rebuilds disable all source autogeneration rules Optional Packages: @@ -1585,6 +1669,14 @@ C compiler flags for VINAGRE, overriding pkg-config VINAGRE_LIBS linker flags for VINAGRE, overriding pkg-config + VNC_CFLAGS C compiler flags for VNC, overriding pkg-config + VNC_LIBS linker flags for VNC, overriding pkg-config + SSH_CFLAGS C compiler flags for SSH, overriding pkg-config + SSH_LIBS linker flags for SSH, overriding pkg-config + TELEPATHY_CFLAGS + C compiler flags for TELEPATHY, overriding pkg-config + TELEPATHY_LIBS + linker flags for TELEPATHY, overriding pkg-config APPLET_CFLAGS C compiler flags for APPLET, overriding pkg-config APPLET_LIBS linker flags for APPLET, overriding pkg-config @@ -1600,15 +1692,17 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1644,7 +1738,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1653,81 +1747,438 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vinagre configure 2.26.1 -generated by GNU Autoconf 2.61 +vinagre configure 2.29.1 +generated by GNU Autoconf 2.64 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -It was created by vinagre $as_me 2.26.1, which was -generated by GNU Autoconf 2.61. Invocation command line was +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval - $ $0 $@ +} # ac_fn_c_try_compile -_ACEOF -exec 5>>config.log +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` +} # ac_fn_c_try_cpp -_ASUNAME +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + return $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 -} >&5 +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -cat >&5 <<_ACEOF +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $2 -## ----------- ## -## Core tests. ## -## ----------- ## +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif +int +main () +{ +return $2 (); + ; + return 0; +} _ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( cat <<\_ASBOX +## ------------------------------------------------- ## +## Report this to http://projects.gnome.org/vinagre/ ## +## ------------------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by vinagre $as_me 2.29.1, which was +generated by GNU Autoconf 2.64. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1739,12 +2190,12 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1760,13 +2211,13 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1791,12 +2242,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1825,9 +2277,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1842,9 +2294,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1860,64 +2312,69 @@ echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do + test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1927,16 +2384,16 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1950,68 +2407,56 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - - - - - - - - + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2021,28 +2466,23 @@ -am__api_version='1.10' +VINAGRE_API_VERSION=1.0 + + +am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2067,22 +2507,23 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2100,17 +2541,29 @@ # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac -done + + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -2123,8 +2576,8 @@ INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2134,21 +2587,34 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2158,11 +2624,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2171,52 +2634,162 @@ # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. +# Double any \ or $. # By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do + for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( @@ -2228,7 +2801,7 @@ esac done done -done + done IFS=$as_save_IFS fi @@ -2244,8 +2817,8 @@ MKDIR_P="$ac_install_sh -d" fi fi -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 -echo "${ECHO_T}$MKDIR_P" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" case $mkdir_p in @@ -2257,10 +2830,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -2270,36 +2843,37 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -n "$AWK" && break done -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -2316,12 +2890,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2340,9 +2914,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2358,7 +2930,7 @@ # Define the identity of the package. PACKAGE=vinagre - VERSION=2.26.1 + VERSION=2.29.1 cat >>confdefs.h <<_ACEOF @@ -2386,115 +2958,9 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. AMTAR=${AMTAR-"${am_missing_run}tar"} @@ -2506,17 +2972,18 @@ ac_config_headers="$ac_config_headers config.h" -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -2529,6 +2996,20 @@ +# Use the silent-rules feature when possible. +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; +esac +AM_BACKSLASH='\' + + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" @@ -2540,44 +3021,44 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -2602,10 +3083,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2615,25 +3096,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2642,10 +3123,10 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2655,25 +3136,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2681,12 +3162,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2699,10 +3176,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2712,25 +3189,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2739,10 +3216,10 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2753,18 +3230,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2783,11 +3260,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2798,10 +3275,10 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2811,25 +3288,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2842,10 +3319,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2855,25 +3332,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2885,12 +3362,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2900,98 +3373,82 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - +#include int main () { +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3001,14 +3458,14 @@ do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3027,78 +3484,75 @@ else ac_file='' fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +if test -z "$ac_file"; then : + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } fi - ac_exeext=$ac_cv_exeext # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (case "(($ac_try" in + { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ac_clean_files=$ac_clean_files_save # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3106,37 +3560,31 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3148,51 +3596,46 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3206,54 +3649,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3264,34 +3687,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3302,35 +3702,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3341,42 +3718,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3392,18 +3745,14 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3460,31 +3809,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3495,17 +3822,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3515,10 +3844,10 @@ depcc="$CC" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -3543,6 +3872,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -3560,7 +3894,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -3570,19 +3914,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -3606,8 +3954,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -3622,17 +3970,13 @@ -{ echo "$as_me:$LINENO: checking for library containing strerror" >&5 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } -if test "${ac_cv_search_strerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 +$as_echo_n "checking for library containing strerror... " >&6; } +if test "${ac_cv_search_strerror+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -3657,50 +4001,27 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_strerror=$ac_res -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then : break fi done -if test "${ac_cv_search_strerror+set}" = set; then - : +if test "${ac_cv_search_strerror+set}" = set; then : + else ac_cv_search_strerror=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -echo "${ECHO_T}$ac_cv_search_strerror" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 +$as_echo "$ac_cv_search_strerror" >&6; } ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -3713,10 +4034,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3726,25 +4047,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3753,10 +4074,10 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -3766,25 +4087,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -3792,12 +4113,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3810,10 +4127,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3823,25 +4140,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3850,10 +4167,10 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3864,18 +4181,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -3894,11 +4211,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3909,10 +4226,10 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -3922,25 +4239,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3953,10 +4270,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -3966,25 +4283,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3996,12 +4313,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4011,56 +4324,42 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4074,54 +4373,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4132,34 +4411,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4170,35 +4426,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4209,42 +4442,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -4260,18 +4469,14 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4328,31 +4533,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -4363,17 +4546,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4383,10 +4568,10 @@ depcc="$CC" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -4411,6 +4596,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -4428,7 +4618,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -4438,19 +4638,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -4474,8 +4678,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -4497,10 +4701,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4510,25 +4714,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4537,10 +4741,10 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -4550,25 +4754,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -4576,12 +4780,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4594,10 +4794,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4607,25 +4807,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4634,10 +4834,10 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4648,18 +4848,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -4678,11 +4878,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4693,10 +4893,10 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -4706,25 +4906,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4737,10 +4937,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -4750,25 +4950,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4780,12 +4980,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4795,56 +4991,42 @@ fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + rm -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4858,54 +5040,34 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4916,34 +5078,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4954,35 +5093,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4993,42 +5109,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -5044,18 +5136,14 @@ CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -5112,31 +5200,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -5147,17 +5213,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5167,10 +5235,10 @@ depcc="$CC" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -5195,6 +5263,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -5212,7 +5285,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -5222,19 +5305,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -5258,8 +5345,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -5281,15 +5368,15 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -5303,11 +5390,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -5316,76 +5399,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -5397,8 +5438,8 @@ else ac_cv_prog_CPP=$CPP fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -5408,11 +5449,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -5421,83 +5458,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -5507,45 +5501,40 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -5557,77 +5546,61 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -5639,46 +5612,31 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_EGREP=$EGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -5693,47 +5651,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -5743,18 +5677,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -5764,14 +5694,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -5798,61 +5724,66 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=no fi + + + + + + + + case `pwd` in *\ * | *\ *) - { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.2.4' -macro_revision='1.2976' +macro_version='2.2.6' +macro_revision='1.3012' @@ -5870,35 +5801,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -5914,28 +5837,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -5951,51 +5870,46 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if test "${ac_cv_path_SED+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" done - echo "$ac_script" | sed 99q >conftest.sed - $as_unset ac_script || ac_script= - # Extract the first word of "sed gsed" to use in msg output -if test -z "$SED"; then -set dummy sed gsed; ac_prog_name=$2 -if test "${ac_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then ac_path_SED_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue - # Check for GNU ac_path_SED and select it if it is found. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue +# Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in *GNU*) ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo '' >> "conftest.nl" + $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" @@ -6007,31 +5921,21 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_SED_found && break 3 + $ac_path_SED_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -SED="$ac_cv_path_SED" -if test -z "$SED"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_SED"; then + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi else ac_cv_path_SED=$SED fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5 -echo "${ECHO_T}$ac_cv_path_SED" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -6048,48 +5952,43 @@ -{ echo "$as_me:$LINENO: checking for fgrep" >&5 -echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if test "${ac_cv_path_FGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else - # Extract the first word of "fgrep" to use in msg output -if test -z "$FGREP"; then -set dummy fgrep; ac_prog_name=$2 -if test "${ac_cv_path_FGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$FGREP"; then ac_path_FGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue - # Check for GNU ac_path_FGREP and select it if it is found. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue +# Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in *GNU*) ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'FGREP' >> "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" @@ -6101,33 +6000,22 @@ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_FGREP_found && break 3 + $ac_path_FGREP_found && break 3 + done + done done -done - -done IFS=$as_save_IFS - - -fi - -FGREP="$ac_cv_path_FGREP" -if test -z "$FGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - + if test -z "$ac_cv_path_FGREP"; then + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else ac_cv_path_FGREP=$FGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5 -echo "${ECHO_T}$ac_cv_path_FGREP" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -6152,7 +6040,7 @@ # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then +if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no @@ -6161,8 +6049,8 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -6191,14 +6079,14 @@ ;; esac elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${lt_cv_path_LD+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR @@ -6228,19 +6116,17 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then : + $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -6264,10 +6150,10 @@ -{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5 -echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; } -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test "${lt_cv_path_NM+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$NM"; then # Let the user override the test. @@ -6313,8 +6199,8 @@ : ${lt_cv_path_NM=no} fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else @@ -6324,10 +6210,10 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. @@ -6337,25 +6223,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { echo "$as_me:$LINENO: result: $DUMPBIN" >&5 -echo "${ECHO_T}$DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6368,10 +6254,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. @@ -6381,25 +6267,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5 -echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6411,12 +6297,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN @@ -6435,45 +6317,45 @@ -{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5 -echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; } -if test "${lt_cv_nm_interface+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6445: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6327: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6448: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6330: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6451: output\"" >&5) + (eval echo "\"\$as_me:6333: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi rm -f conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 -echo "${ECHO_T}$lt_cv_nm_interface" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if test "${lt_cv_sys_max_cmd_len+set}" = set; then : + $as_echo_n "(cached) " >&6 else i=0 teststring="ABCD" @@ -6494,7 +6376,7 @@ lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, @@ -6590,11 +6472,11 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then - { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -6607,8 +6489,8 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5 -echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -6617,18 +6499,18 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ echo "$as_me:$LINENO: result: $xsi_shell" >&5 -echo "${ECHO_T}$xsi_shell" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +$as_echo "$xsi_shell" >&6; } -{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5 -echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5 -echo "${ECHO_T}$lt_shell_append" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +$as_echo "$lt_shell_append" >&6; } if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -6662,15 +6544,15 @@ -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if test "${lt_cv_ld_reload_flag+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -6695,11 +6577,112 @@ +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + + + -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if test "${lt_cv_deplibs_check_method+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -6749,6 +6732,12 @@ fi ;; +cegcc) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; @@ -6886,8 +6875,8 @@ esac fi -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -6906,10 +6895,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. @@ -6919,25 +6908,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6946,10 +6935,10 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. @@ -6959,25 +6948,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_AR" = x; then @@ -6985,12 +6974,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -7015,10 +7000,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -7028,25 +7013,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7055,10 +7040,10 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -7068,25 +7053,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -7094,12 +7079,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -7118,10 +7099,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -7131,25 +7112,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7158,10 +7139,10 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -7171,25 +7152,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -7197,12 +7178,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -7279,10 +7256,10 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : + $as_echo_n "(cached) " >&6 else # These are sane defaults that work on at least a few old systems. @@ -7299,7 +7276,7 @@ aix*) symcode='[BCDT]' ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) symcode='[ABCDGISTW]' ;; hpux*) @@ -7397,18 +7374,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -7461,11 +7438,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext}; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" @@ -7499,11 +7476,11 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } fi @@ -7528,7 +7505,7 @@ # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then +if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi @@ -7540,11 +7517,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -7558,12 +7535,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7561 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + echo '#line 7538 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -7597,11 +7574,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -7650,10 +7627,10 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if test "${lt_cv_cc_needs_belf+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -7661,11 +7638,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -7676,34 +7649,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_cc_needs_belf=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7711,8 +7663,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -7721,11 +7673,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in @@ -7751,10 +7703,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. @@ -7764,25 +7716,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -echo "${ECHO_T}$DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7791,10 +7743,10 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. @@ -7804,25 +7756,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -7830,12 +7782,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -7847,10 +7795,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. @@ -7860,25 +7808,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -echo "${ECHO_T}$NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7887,10 +7835,10 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. @@ -7900,25 +7848,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -7926,12 +7874,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -7943,10 +7887,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. @@ -7956,25 +7900,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { echo "$as_me:$LINENO: result: $LIPO" >&5 -echo "${ECHO_T}$LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7983,10 +7927,10 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. @@ -7996,25 +7940,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_LIPO="lipo" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5 -echo "${ECHO_T}$ac_ct_LIPO" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -8022,12 +7966,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -8039,10 +7979,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. @@ -8052,25 +7992,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { echo "$as_me:$LINENO: result: $OTOOL" >&5 -echo "${ECHO_T}$OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8079,10 +8019,10 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. @@ -8092,25 +8032,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL="otool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5 -echo "${ECHO_T}$ac_ct_OTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -8118,12 +8058,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -8135,10 +8071,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. @@ -8148,25 +8084,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { echo "$as_me:$LINENO: result: $OTOOL64" >&5 -echo "${ECHO_T}$OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8175,10 +8111,10 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. @@ -8188,25 +8124,25 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL64="otool64" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5 -echo "${ECHO_T}$ac_ct_OTOOL64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -8214,12 +8150,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -8254,10 +8186,10 @@ - { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if test "${lt_cv_apple_cc_single_mod+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then @@ -8281,22 +8213,18 @@ rm -f conftest.* fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } - { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8307,39 +8235,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : lt_cv_ld_exported_symbols_list=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - lt_cv_ld_exported_symbols_list=no + lt_cv_ld_exported_symbols_list=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -8376,126 +8283,30 @@ esac # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +done + + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_DLFCN_H 1 _ACEOF fi @@ -8515,7 +8326,7 @@ # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then +if test "${enable_shared+set}" = set; then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -8545,40 +8356,10 @@ - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi - - - - - - - - # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then +if test "${with_pic+set}" = set; then : withval=$with_pic; pic_mode="$withval" else pic_mode=default @@ -8594,7 +8375,7 @@ # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then +if test "${enable_fast_install+set}" = set; then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -8675,10 +8456,10 @@ setopt NO_GLOB_SUBST fi -{ echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } -if test "${lt_cv_objdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if test "${lt_cv_objdir+set}" = set; then : + $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -8690,8 +8471,8 @@ fi rmdir .libs 2>/dev/null fi -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -8783,10 +8564,10 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) @@ -8836,11 +8617,11 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8849,10 +8630,10 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) @@ -8902,11 +8683,11 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8982,10 +8763,10 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' - { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext @@ -9000,11 +8781,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9003: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8784: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9007: \$? = $ac_status" >&5 + echo "$as_me:8788: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9017,8 +8798,8 @@ $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -9037,8 +8818,8 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -9072,7 +8853,7 @@ # PIC is the default for these OSes. ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -9087,10 +8868,11 @@ ;; hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. case $host_cpu in - hppa*64*|ia64*) + hppa*64*) # +Z the default ;; *) @@ -9140,7 +8922,7 @@ fi ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' @@ -9170,11 +8952,25 @@ linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc* | ifort*) + # old Intel for x86_64 which still supported -KPIC. + ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -9294,8 +9090,8 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +$as_echo "$lt_prog_compiler_pic" >&6; } @@ -9306,10 +9102,10 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext @@ -9324,11 +9120,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9327: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9123: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9331: \$? = $ac_status" >&5 + echo "$as_me:9127: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9341,8 +9137,8 @@ $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -9365,10 +9161,10 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test "${lt_cv_prog_compiler_static_works+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" @@ -9393,8 +9189,8 @@ LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -9408,10 +9204,10 @@ - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null @@ -9429,11 +9225,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9432: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9228: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9436: \$? = $ac_status" >&5 + echo "$as_me:9232: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9455,18 +9251,18 @@ $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then : + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null @@ -9484,11 +9280,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9487: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9283: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9491: \$? = $ac_status" >&5 + echo "$as_me:9287: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9510,8 +9306,8 @@ $RM conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } @@ -9519,19 +9315,19 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -9543,8 +9339,8 @@ - { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -9588,7 +9384,7 @@ extract_expsyms_cmds= case $host_os in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -9603,6 +9399,9 @@ openbsd*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -9675,7 +9474,7 @@ fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -9741,6 +9540,9 @@ tmp_addflag=' -i_dynamic -nofor_main' ;; ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; @@ -9973,6 +9775,7 @@ fi fi + export_dynamic_flag_spec='${wl}-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes @@ -9982,11 +9785,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9997,24 +9796,7 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -10028,15 +9810,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -10049,11 +9825,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10064,24 +9836,7 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -10095,15 +9850,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" @@ -10139,7 +9888,7 @@ export_dynamic_flag_spec=-rdynamic ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -10170,7 +9919,11 @@ whole_archive_flag_spec='' link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" - if test "$GCC" = "yes"; then + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then output_verbose_link_cmd=echo archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" @@ -10262,7 +10015,7 @@ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -10311,38 +10064,16 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat >conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int foo(void) {} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' @@ -10598,8 +10329,8 @@ fi fi -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10635,16 +10366,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -10658,11 +10389,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } then archive_cmds_need_lc=no else @@ -10673,8 +10404,8 @@ cat conftest.err 1>&5 fi $RM conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 +$as_echo "$archive_cmds_need_lc" >&6; } ;; esac fi @@ -10837,8 +10568,8 @@ - { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then case $host_os in @@ -11000,14 +10731,14 @@ # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32*) +cygwin* | mingw* | pw32* | cegcc*) version_type=windows shrext_cmds=".dll" need_version=no need_lib_prefix=no case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32*) + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -11030,7 +10761,7 @@ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; - mingw*) + mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` @@ -11259,11 +10990,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -11274,37 +11001,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : shlibpath_overrides_runpath=yes fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -11511,7 +11214,7 @@ version_type=linux need_lib_prefix=no need_version=no - library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -11528,8 +11231,8 @@ dynamic_linker=no ;; esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -11630,8 +11333,8 @@ - { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -11655,8 +11358,8 @@ # directories. hardcode_action=unsupported fi -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || test "$inherit_rpath" = yes; then @@ -11688,7 +11391,7 @@ lt_cv_dlopen_self=yes ;; - mingw* | pw32*) + mingw* | pw32* | cegcc*) lt_cv_dlopen="LoadLibrary" lt_cv_dlopen_libs= ;; @@ -11700,18 +11403,14 @@ darwin*) # if libdl is installed we need to link against it - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11729,39 +11428,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -11774,33 +11452,19 @@ ;; *) - { echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -11809,13 +11473,6 @@ extern "C" #endif char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shl_load || defined __stub___shl_load -choke me -#endif - int main () { @@ -11824,52 +11481,32 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_shl_load=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no + ac_cv_lib_dld_shl_load=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" else - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -11878,77 +11515,38 @@ #ifdef __cplusplus extern "C" #endif -char shl_load (); +char dlopen (); int main () { -return shl_load (); +return dlopen (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_load=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no + ac_cv_lib_dl_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -11957,13 +11555,6 @@ extern "C" #endif char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_dlopen || defined __stub___dlopen -choke me -#endif - int main () { @@ -11972,52 +11563,28 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_dlopen=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no + ac_cv_lib_svld_dlopen=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -12026,176 +11593,27 @@ #ifdef __cplusplus extern "C" #endif -char dlopen (); +char dld_link (); int main () { -return dlopen (); +return dld_link (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dl_dlopen=yes +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no + ac_cv_lib_dld_dld_link=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_svld_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_dld_link=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_dld_link=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -if test $ac_cv_lib_dld_dld_link = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -12234,10 +11652,10 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross @@ -12245,7 +11663,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12248 "configure" +#line 11666 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12286,10 +11704,6 @@ # endif #endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif - void fnord() { int i=42;} int main () { @@ -12305,14 +11719,14 @@ else puts (dlerror ()); - exit (status); + return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12329,15 +11743,15 @@ fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if test "${lt_cv_dlopen_self_static+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross @@ -12345,7 +11759,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12348 "configure" +#line 11762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12386,10 +11800,6 @@ # endif #endif -#ifdef __cplusplus -extern "C" void exit (int); -#endif - void fnord() { int i=42;} int main () { @@ -12405,14 +11815,14 @@ else puts (dlerror ()); - exit (status); + return status; } _LT_EOF - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -12429,8 +11839,8 @@ fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -12468,13 +11878,13 @@ striplib= old_striplib= -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -12482,16 +11892,16 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi ;; *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } ;; esac fi @@ -12508,13 +11918,13 @@ # Report which library types will actually be built - { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } - { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -12534,15 +11944,15 @@ fi ;; esac - { echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } - { echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } @@ -12577,22 +11987,18 @@ if test "x$CC" != xcc; then - { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5 -echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } else - { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5 -echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 +$as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi -set dummy $CC; ac_cc=`echo $2 | +set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -12608,58 +12014,63 @@ # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* -if { (case "(($ac_try" in +if { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. if { ac_try='cc -c conftest.$ac_ext >&5' - { (case "(($ac_try" in + { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* - if { (case "(($ac_try" in + if { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (case "(($ac_try" in + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && + test -f conftest2.$ac_objext && { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then # cc works too. : @@ -12676,23 +12087,22 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -cat >>confdefs.h <<\_ACEOF -#define NO_MINUS_C_MINUS_O 1 -_ACEOF +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h fi # FIXME: we rely on the cache variable name because # there is no other way. set dummy $CC -ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. # But if we don't then we get into trouble of one sort or another. @@ -12706,7 +12116,7 @@ # Check whether --enable-compile-warnings was given. -if test "${enable_compile_warnings+set}" = set; then +if test "${enable_compile_warnings+set}" = set; then : enableval=$enable_compile_warnings; else enable_compile_warnings="yes" @@ -12737,13 +12147,9 @@ for option in -Wno-sign-compare; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" - { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 -echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 +$as_echo_n "checking whether gcc understands $option... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -12754,35 +12160,15 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : has_option=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - has_option=no + has_option=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$SAVE_CFLAGS" - { echo "$as_me:$LINENO: result: $has_option" >&5 -echo "${ECHO_T}$has_option" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 +$as_echo "$has_option" >&6; } if test $has_option = yes; then warning_flags="$warning_flags $option" fi @@ -12795,27 +12181,25 @@ fi ;; *) - { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 -echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 ;; esac CFLAGS="$realsave_CFLAGS" - { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 -echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: $warning_flags" >&5 -echo "${ECHO_T}$warning_flags" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 +$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5 +$as_echo "$warning_flags" >&6; } # Check whether --enable-iso-c was given. -if test "${enable_iso_c+set}" = set; then +if test "${enable_iso_c+set}" = set; then : enableval=$enable_iso_c; else enable_iso_c=no fi - { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 -echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5 +$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } complCFLAGS= if test "x$enable_iso_c" != "xno"; then if test "x$GCC" = "xyes"; then @@ -12829,8 +12213,8 @@ esac fi fi - { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 -echo "${ECHO_T}$complCFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 +$as_echo "$complCFLAGS" >&6; } WARN_CFLAGS="$warning_flags $complCFLAGS" @@ -12848,53 +12232,49 @@ - { echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then +if test "${enable_nls+set}" = set; then : enableval=$enable_nls; USE_NLS=$enableval else USE_NLS=yes fi - { echo "$as_me:$LINENO: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } case "$am__api_version" in 1.01234) - { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 -echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; esac if test -n "0.35.0"; then - { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5 -echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 +$as_echo_n "checking for intltool >= 0.35.0... " >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 -echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 +$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5 -echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in [\\/]* | ?:[\\/]*) @@ -12906,14 +12286,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12921,20 +12301,20 @@ fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 -echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 +$as_echo "$INTLTOOL_UPDATE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) @@ -12946,14 +12326,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -12961,20 +12341,20 @@ fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 -echo "${ECHO_T}$INTLTOOL_MERGE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 +$as_echo "$INTLTOOL_MERGE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in [\\/]* | ?:[\\/]*) @@ -12986,14 +12366,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -13001,18 +12381,16 @@ fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 -echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 +$as_echo "$INTLTOOL_EXTRACT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 -echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -13055,13 +12433,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $XGETTEXT in [\\/]* | ?:[\\/]*) @@ -13073,14 +12527,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -13088,20 +12542,20 @@ fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGMERGE+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $MSGMERGE in [\\/]* | ?:[\\/]*) @@ -13113,14 +12567,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -13128,20 +12582,20 @@ fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { echo "$as_me:$LINENO: result: $MSGMERGE" >&5 -echo "${ECHO_T}$MSGMERGE" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $MSGFMT in [\\/]* | ?:[\\/]*) @@ -13153,14 +12607,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -13168,20 +12622,20 @@ fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $GMSGFMT in [\\/]* | ?:[\\/]*) @@ -13193,14 +12647,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -13209,34 +12663,30 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in [\\/]* | ?:[\\/]*) @@ -13248,14 +12698,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -13263,34 +12713,35 @@ fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then - { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 -echo "${ECHO_T}$INTLTOOL_PERL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 +$as_echo "$INTLTOOL_PERL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$INTLTOOL_PERL"; then - { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 -echo "$as_me: error: perl not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 -echo "$as_me: error: perl 5.x required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "perl not found" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 +$as_echo_n "checking for perl >= 5.8.1... " >&6; } +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 +$as_echo "$IT_PERL_VERSION" >&6; } fi if test "x" != "xno-xml"; then - { echo "$as_me:$LINENO: checking for XML::Parser" >&5 -echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 +$as_echo_n "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } else - { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -13300,11 +12751,7 @@ # Set DATADIRNAME correctly if it is not set yet # (copied from glib-gettext.m4) if test -z "$DATADIRNAME"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -13316,113 +12763,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : DATADIRNAME=share else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in + case $host in *-*-solaris*) - { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef bind_textdomain_codeset - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_bind_textdomain_codeset=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -if test $ac_cv_func_bind_textdomain_codeset = yes; then + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -13434,155 +12781,21 @@ ;; esac fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi - - - - - - - -for ac_header in locale.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------------- ## -## Report this to http://projects.gnome.org/vinagre/ ## -## ------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then + for ac_header in locale.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LOCALE_H 1 _ACEOF fi @@ -13590,16 +12803,12 @@ done if test $ac_cv_header_locale_h = yes; then - { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -13610,42 +12819,19 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_val_LC_MESSAGES=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=no + am_cv_val_LC_MESSAGES=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } if test $am_cv_val_LC_MESSAGES = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h fi fi @@ -13658,153 +12844,20 @@ XGETTEXT=: INTLLIBS= - if test "${ac_cv_header_libintl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 -echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 -echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------------------- ## -## Report this to http://projects.gnome.org/vinagre/ ## -## ------------------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for libintl.h" >&5 -echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } - -fi -if test $ac_cv_header_libintl_h = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = x""yes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" # # First check in libc # - { echo "$as_me:$LINENO: checking for ngettext in libc" >&5 -echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 +$as_echo_n "checking for ngettext in libc... " >&6; } +if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -13817,186 +12870,57 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_ngettext_libc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_ngettext_libc=no + gt_cv_func_ngettext_libc=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 +$as_echo "$gt_cv_func_ngettext_libc" >&6; } if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { echo "$as_me:$LINENO: checking for dgettext in libc" >&5 -echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include - -int -main () -{ -return !dgettext ("","") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - gt_cv_func_dgettext_libc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_dgettext_libc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; } - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 +$as_echo_n "checking for dgettext in libc... " >&6; } +if test "${gt_cv_func_dgettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif +#include int main () { -return $ac_func (); +return !dgettext ("","") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_dgettext_libc=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + gt_cv_func_dgettext_libc=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 +$as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -14011,18 +12935,14 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 +$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } +if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -14040,51 +12960,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_bindtextdomain=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_bindtextdomain=no + ac_cv_lib_intl_bindtextdomain=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; } -if test $ac_cv_lib_intl_bindtextdomain = yes; then - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 +$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } +if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -14102,51 +12997,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -if test $ac_cv_lib_intl_ngettext = yes; then - { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 +$as_echo_n "checking for dgettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -14164,39 +13034,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dgettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dgettext=no + ac_cv_lib_intl_dgettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } -if test $ac_cv_lib_intl_dgettext = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 +$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes fi @@ -14206,22 +13055,18 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 -echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6; } - { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 -echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 +$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 +$as_echo_n "checking for ngettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -14239,51 +13084,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; } -if test $ac_cv_lib_intl_ngettext = yes; then - { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 -echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 +$as_echo "$ac_cv_lib_intl_ngettext" >&6; } +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 +$as_echo_n "checking for dcgettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -14301,39 +13121,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dcgettext=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dcgettext=no + ac_cv_lib_intl_dcgettext=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; } -if test $ac_cv_lib_intl_dcgettext = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 +$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } +if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -14355,95 +13154,12 @@ glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -14473,16 +13189,14 @@ if test "$gt_cv_have_gettext" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 -_ACEOF +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_MSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case "$MSGFMT" in /*) @@ -14506,112 +13220,29 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then - { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" LIBS="$LIBS $INTLLIBS" - -for ac_func in dcgettext -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then + for ac_func in dcgettext +do : + ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +if test "x$ac_cv_func_dcgettext" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_DCGETTEXT 1 _ACEOF fi done MSGFMT_OPTS= - { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 -echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 +$as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF msgid "" @@ -14625,25 +13256,25 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF -if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 +if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GMSGFMT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $GMSGFMT in [\\/]* | ?:[\\/]*) @@ -14655,14 +13286,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -14671,20 +13302,20 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_XGETTEXT+set}" = set; then : + $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in /*) @@ -14708,18 +13339,14 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -14731,114 +13358,14 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : CATOBJEXT=.gmo DATADIRNAME=share else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in + case $host in *-*-solaris*) - { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef bind_textdomain_codeset - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_bind_textdomain_codeset=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; } -if test $ac_cv_func_bind_textdomain_codeset = yes; then + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -14853,9 +13380,8 @@ ;; esac fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else @@ -14869,9 +13395,7 @@ if test "$gt_cv_have_gettext" = "yes" ; then -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF +$as_echo "#define ENABLE_NLS 1" >>confdefs.h fi @@ -14879,8 +13403,8 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 +$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi fi @@ -14912,8 +13436,8 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 +$as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -14937,8 +13461,8 @@ fi done LINGUAS=$NEW_LINGUAS - { echo "$as_me:$LINENO: result: $LINGUAS" >&5 -echo "${ECHO_T}$LINGUAS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 +$as_echo "$LINGUAS" >&6; } fi if test -n "$LINGUAS"; then @@ -14976,10 +13500,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -14991,14 +13515,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -15006,11 +13530,11 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -15019,10 +13543,10 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15034,14 +13558,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -15049,11 +13573,11 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -15061,12 +13585,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -15078,14 +13598,14 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } PKG_CONFIG="" fi @@ -15093,29 +13613,33 @@ gdu_cv_version_required=0.3.2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 +$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; } if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5 ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then gdu_cv_have_gdu=yes else gdu_cv_have_gdu=no fi if test "$gdu_cv_have_gdu" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } : else - { { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5 -echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 fi # Check whether --with-help-dir was given. -if test "${with_help_dir+set}" = set; then +if test "${with_help_dir+set}" = set; then : withval=$with_help_dir; else with_help_dir='${datadir}/gnome/help' @@ -15126,7 +13650,7 @@ # Check whether --with-omf-dir was given. -if test "${with_omf_dir+set}" = set; then +if test "${with_omf_dir+set}" = set; then : withval=$with_omf_dir; else with_omf_dir='${datadir}/omf' @@ -15137,7 +13661,7 @@ # Check whether --with-help-formats was given. -if test "${with_help_formats+set}" = set; then +if test "${with_help_formats+set}" = set; then : withval=$with_help_formats; else with_help_formats='' @@ -15147,7 +13671,7 @@ # Check whether --enable-scrollkeeper was given. -if test "${enable_scrollkeeper+set}" = set; then +if test "${enable_scrollkeeper+set}" = set; then : enableval=$enable_scrollkeeper; else enable_scrollkeeper=yes @@ -15182,16 +13706,18 @@ GLIB_REQUIRED=2.17.0 GTK_REQUIRED=2.13.1 -LIBGLADE_REQUIRED=2.6.0 GCONF_REQUIRED=2.16.0 GTHREAD_REQUIRED=2.0.0 -GTK_VNC_REQUIRED=0.3.8 +GTK_VNC_REQUIRED=0.3.10 AVAHI_REQUIRED=0.6.22 PANEL_REQUIRED_VERSION=2.0.0 +TELEPATHY_GLIB_REQUIRED=0.7.31 +XML_REQUIRED=2.6.31 +VTE_REQUIRED=0.20 # Check for avahi # Check whether --enable-avahi was given. -if test "${enable_avahi+set}" = set; then +if test "${enable_avahi+set}" = set; then : enableval=$enable_avahi; enable_avahi=${enableval} else enable_avahi=yes @@ -15201,23 +13727,23 @@ if test "x$enable_avahi" = "xyes" ; then pkg_failed=no -{ echo "$as_me:$LINENO: checking for AVAHI" >&5 -echo $ECHO_N "checking for AVAHI... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5 +$as_echo_n "checking for AVAHI... " >&6; } if test -n "$PKG_CONFIG"; then if test -n "$AVAHI_CFLAGS"; then pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ avahi-ui >= \$AVAHI_REQUIRED\\ - avahi-gobject >= \$AVAHI_REQUIRED\"") >&5 + avahi-gobject >= \$AVAHI_REQUIRED\""; } >&5 ($PKG_CONFIG --exists --print-errors "\ avahi-ui >= $AVAHI_REQUIRED\ avahi-gobject >= $AVAHI_REQUIRED") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "\ avahi-ui >= $AVAHI_REQUIRED\ avahi-gobject >= $AVAHI_REQUIRED" 2>/dev/null` @@ -15233,15 +13759,15 @@ pkg_cv_AVAHI_LIBS="$AVAHI_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ avahi-ui >= \$AVAHI_REQUIRED\\ - avahi-gobject >= \$AVAHI_REQUIRED\"") >&5 + avahi-gobject >= \$AVAHI_REQUIRED\""; } >&5 ($PKG_CONFIG --exists --print-errors "\ avahi-ui >= $AVAHI_REQUIRED\ avahi-gobject >= $AVAHI_REQUIRED") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "\ avahi-ui >= $AVAHI_REQUIRED\ avahi-gobject >= $AVAHI_REQUIRED" 2>/dev/null` @@ -15274,20 +13800,7 @@ # Put the nasty error message in config.log where it belongs echo "$AVAHI_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (\ - avahi-ui >= $AVAHI_REQUIRED\ - avahi-gobject >= $AVAHI_REQUIRED) were not met: - -$AVAHI_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables AVAHI_CFLAGS -and AVAHI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (\ + as_fn_error "Package requirements (\ avahi-ui >= $AVAHI_REQUIRED\ avahi-gobject >= $AVAHI_REQUIRED) were not met: @@ -15299,20 +13812,11 @@ Alternatively, you may set the environment variables AVAHI_CFLAGS and AVAHI_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables AVAHI_CFLAGS -and AVAHI_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -15321,21 +13825,18 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +See \`config.log' for more details." "$LINENO" 5; } else AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS AVAHI_LIBS=$pkg_cv_AVAHI_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } : fi -cat >>confdefs.h <<\_ACEOF -#define VINAGRE_ENABLE_AVAHI 1 -_ACEOF +$as_echo "#define VINAGRE_ENABLE_AVAHI 1" >>confdefs.h fi if test "x$enable_avahi" = "xyes"; then @@ -15349,44 +13850,454 @@ pkg_failed=no -{ echo "$as_me:$LINENO: checking for VINAGRE" >&5 -echo $ECHO_N "checking for VINAGRE... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VINAGRE" >&5 +$as_echo_n "checking for VINAGRE... " >&6; } if test -n "$PKG_CONFIG"; then if test -n "$VINAGRE_CFLAGS"; then pkg_cv_VINAGRE_CFLAGS="$VINAGRE_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ glib-2.0 >= \$GLIB_REQUIRED \\ gio-2.0 >= \$GLIB_REQUIRED \\ gtk+-2.0 >= \$GTK_REQUIRED \\ - libglade-2.0 >= \$LIBGLADE_REQUIRED \\ gconf-2.0 >= \$GCONF_REQUIRED \\ gthread-2.0 >= \$GTHREAD_REQUIRED \\ gnome-keyring-1 \\ - gtk-vnc-1.0 >= \$GTK_VNC_REQUIRED\"") >&5 + libxml-2.0 >= \$XML_REQUIRED +\""; } >&5 ($PKG_CONFIG --exists --print-errors "\ glib-2.0 >= $GLIB_REQUIRED \ gio-2.0 >= $GLIB_REQUIRED \ gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ gconf-2.0 >= $GCONF_REQUIRED \ gthread-2.0 >= $GTHREAD_REQUIRED \ gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED") 2>&5 + libxml-2.0 >= $XML_REQUIRED +") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_VINAGRE_CFLAGS=`$PKG_CONFIG --cflags "\ glib-2.0 >= $GLIB_REQUIRED \ gio-2.0 >= $GLIB_REQUIRED \ gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ gconf-2.0 >= $GCONF_REQUIRED \ gthread-2.0 >= $GTHREAD_REQUIRED \ gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED" 2>/dev/null` + libxml-2.0 >= $XML_REQUIRED +" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$VINAGRE_LIBS"; then + pkg_cv_VINAGRE_LIBS="$VINAGRE_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + glib-2.0 >= \$GLIB_REQUIRED \\ + gio-2.0 >= \$GLIB_REQUIRED \\ + gtk+-2.0 >= \$GTK_REQUIRED \\ + gconf-2.0 >= \$GCONF_REQUIRED \\ + gthread-2.0 >= \$GTHREAD_REQUIRED \\ + gnome-keyring-1 \\ + libxml-2.0 >= \$XML_REQUIRED +\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ + glib-2.0 >= $GLIB_REQUIRED \ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_VINAGRE_LIBS=`$PKG_CONFIG --libs "\ + glib-2.0 >= $GLIB_REQUIRED \ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + VINAGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ + glib-2.0 >= $GLIB_REQUIRED \ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +"` + else + VINAGRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ + glib-2.0 >= $GLIB_REQUIRED \ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +"` + fi + # Put the nasty error message in config.log where it belongs + echo "$VINAGRE_PKG_ERRORS" >&5 + + as_fn_error "Package requirements (\ + glib-2.0 >= $GLIB_REQUIRED \ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +) were not met: + +$VINAGRE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables VINAGRE_CFLAGS +and VINAGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables VINAGRE_CFLAGS +and VINAGRE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +else + VINAGRE_CFLAGS=$pkg_cv_VINAGRE_CFLAGS + VINAGRE_LIBS=$pkg_cv_VINAGRE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VNC" >&5 +$as_echo_n "checking for VNC... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$VNC_CFLAGS"; then + pkg_cv_VNC_CFLAGS="$VNC_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gtk-vnc-1.0 >= \$GTK_VNC_REQUIRED \\ + libxml-2.0 >= \$XML_REQUIRED +\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ + gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED +") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_VNC_CFLAGS=`$PKG_CONFIG --cflags "\ + gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED +" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$VNC_LIBS"; then + pkg_cv_VNC_LIBS="$VNC_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + gtk-vnc-1.0 >= \$GTK_VNC_REQUIRED \\ + libxml-2.0 >= \$XML_REQUIRED +\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ + gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED +") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_VNC_LIBS=`$PKG_CONFIG --libs "\ + gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED +" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ + gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED +"` + else + VNC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ + gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED +"` + fi + # Put the nasty error message in config.log where it belongs + echo "$VNC_PKG_ERRORS" >&5 + + as_fn_error "Package requirements (\ + gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED +) were not met: + +$VNC_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables VNC_CFLAGS +and VNC_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables VNC_CFLAGS +and VNC_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +else + VNC_CFLAGS=$pkg_cv_VNC_CFLAGS + VNC_LIBS=$pkg_cv_VNC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + + + +# Check for SSH +# Check whether --enable-ssh was given. +if test "${enable_ssh+set}" = set; then : + enableval=$enable_ssh; enable_ssh=${enableval} +else + enable_ssh=no +fi + + +if test "x$enable_ssh" = "xyes" ; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSH" >&5 +$as_echo_n "checking for SSH... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$SSH_CFLAGS"; then + pkg_cv_SSH_CFLAGS="$SSH_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + vte >= \$VTE_REQUIRED \\ + libxml-2.0 >= \$XML_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ + vte >= $VTE_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SSH_CFLAGS=`$PKG_CONFIG --cflags "\ + vte >= $VTE_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$SSH_LIBS"; then + pkg_cv_SSH_LIBS="$SSH_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\\ + vte >= \$VTE_REQUIRED \\ + libxml-2.0 >= \$XML_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "\ + vte >= $VTE_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SSH_LIBS=`$PKG_CONFIG --libs "\ + vte >= $VTE_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + SSH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ + vte >= $VTE_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED"` + else + SSH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ + vte >= $VTE_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SSH_PKG_ERRORS" >&5 + + as_fn_error "Package requirements (\ + vte >= $VTE_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED) were not met: + +$SSH_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables SSH_CFLAGS +and SSH_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables SSH_CFLAGS +and SSH_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +else + SSH_CFLAGS=$pkg_cv_SSH_CFLAGS + SSH_LIBS=$pkg_cv_SSH_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + + + +$as_echo "#define VINAGRE_ENABLE_SSH 1" >>confdefs.h + +fi + if test "x$enable_ssh" = "xyes"; then + SSH_TRUE= + SSH_FALSE='#' +else + SSH_TRUE='#' + SSH_FALSE= +fi + + +# Check for telepathy +# Check whether --enable-telepathy was given. +if test "${enable_telepathy+set}" = set; then : + enableval=$enable_telepathy; +else + enable_telepathy=auto +fi + + +if test "x$enable_telepathy" != "xno"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TELEPATHY" >&5 +$as_echo_n "checking for TELEPATHY... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$TELEPATHY_CFLAGS"; then + pkg_cv_TELEPATHY_CFLAGS="$TELEPATHY_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + telepathy-glib >= \$TELEPATHY_GLIB_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_TELEPATHY_CFLAGS=`$PKG_CONFIG --cflags " + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + " 2>/dev/null` else pkg_failed=yes fi @@ -15395,40 +14306,22 @@ pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$VINAGRE_LIBS"; then - pkg_cv_VINAGRE_LIBS="$VINAGRE_LIBS" + if test -n "$TELEPATHY_LIBS"; then + pkg_cv_TELEPATHY_LIBS="$TELEPATHY_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ - glib-2.0 >= \$GLIB_REQUIRED \\ - gio-2.0 >= \$GLIB_REQUIRED \\ - gtk+-2.0 >= \$GTK_REQUIRED \\ - libglade-2.0 >= \$LIBGLADE_REQUIRED \\ - gconf-2.0 >= \$GCONF_REQUIRED \\ - gthread-2.0 >= \$GTHREAD_REQUIRED \\ - gnome-keyring-1 \\ - gtk-vnc-1.0 >= \$GTK_VNC_REQUIRED\"") >&5 - ($PKG_CONFIG --exists --print-errors "\ - glib-2.0 >= $GLIB_REQUIRED \ - gio-2.0 >= $GLIB_REQUIRED \ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_VINAGRE_LIBS=`$PKG_CONFIG --libs "\ - glib-2.0 >= $GLIB_REQUIRED \ - gio-2.0 >= $GLIB_REQUIRED \ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED" 2>/dev/null` + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + telepathy-glib >= \$TELEPATHY_GLIB_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_TELEPATHY_LIBS=`$PKG_CONFIG --libs " + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + " 2>/dev/null` else pkg_failed=yes fi @@ -15447,119 +14340,79 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VINAGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ - glib-2.0 >= $GLIB_REQUIRED \ - gio-2.0 >= $GLIB_REQUIRED \ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED"` + TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + "` else - VINAGRE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ - glib-2.0 >= $GLIB_REQUIRED \ - gio-2.0 >= $GLIB_REQUIRED \ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED"` + TELEPATHY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + "` fi # Put the nasty error message in config.log where it belongs - echo "$VINAGRE_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (\ - glib-2.0 >= $GLIB_REQUIRED \ - gio-2.0 >= $GLIB_REQUIRED \ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED) were not met: - -$VINAGRE_PKG_ERRORS + echo "$TELEPATHY_PKG_ERRORS" >&5 -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_telepathy="no" +elif test $pkg_failed = untried; then + have_telepathy="no" +else + TELEPATHY_CFLAGS=$pkg_cv_TELEPATHY_CFLAGS + TELEPATHY_LIBS=$pkg_cv_TELEPATHY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_telepathy="yes" +fi + if test "x$have_telepathy" = "xyes"; then -Alternatively, you may set the environment variables VINAGRE_CFLAGS -and VINAGRE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (\ - glib-2.0 >= $GLIB_REQUIRED \ - gio-2.0 >= $GLIB_REQUIRED \ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED) were not met: -$VINAGRE_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +$as_echo "#define HAVE_TELEPATHY /**/" >>confdefs.h -Alternatively, you may set the environment variables VINAGRE_CFLAGS -and VINAGRE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + fi +else + have_telepathy=no +fi -Alternatively, you may set the environment variables VINAGRE_CFLAGS -and VINAGRE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +if test "x$enable_telepathy" = "xyes" -a "x$have_telepathy" != "xyes"; then + as_fn_error "Couldn't find telepathy dependencies." "$LINENO" 5 +fi -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + if test "x$have_telepathy" = "xyes"; then + TELEPATHY_TRUE= + TELEPATHY_FALSE='#' +else + TELEPATHY_TRUE='#' + TELEPATHY_FALSE= +fi -Alternatively, you may set the environment variables VINAGRE_CFLAGS -and VINAGRE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +# Enable/disable gnome-panel applet +# Check whether --enable-applet was given. +if test "${enable_applet+set}" = set; then : + enableval=$enable_applet; enable_applet=$enableval else - VINAGRE_CFLAGS=$pkg_cv_VINAGRE_CFLAGS - VINAGRE_LIBS=$pkg_cv_VINAGRE_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : + enable_applet=yes fi - +if test "x$enable_applet" = "xyes";then pkg_failed=no -{ echo "$as_me:$LINENO: checking for APPLET" >&5 -echo $ECHO_N "checking for APPLET... $ECHO_C" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5 +$as_echo_n "checking for APPLET... " >&6; } if test -n "$PKG_CONFIG"; then if test -n "$APPLET_CFLAGS"; then pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ - libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION\"") >&5 - ($PKG_CONFIG --exists --print-errors "\ - libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "\ - libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -15572,15 +14425,12 @@ pkg_cv_APPLET_LIBS="$APPLET_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\ - libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION\"") >&5 - ($PKG_CONFIG --exists --print-errors "\ - libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "\ - libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION" 2>/dev/null` + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -15599,29 +14449,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "\ - libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION"` + APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION"` else - APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\ - libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION"` + APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION"` fi # Put the nasty error message in config.log where it belongs echo "$APPLET_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (\ - libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION) were not met: - -$APPLET_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables APPLET_CFLAGS -and APPLET_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (\ - libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION) were not met: + as_fn_error "Package requirements (libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION) were not met: $APPLET_PKG_ERRORS @@ -15631,20 +14466,11 @@ Alternatively, you may set the environment variables APPLET_CFLAGS and APPLET_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables APPLET_CFLAGS -and APPLET_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -15653,25 +14479,33 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } +See \`config.log' for more details." "$LINENO" 5; } else APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS APPLET_LIBS=$pkg_cv_APPLET_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } : fi +fi + if test "x$enable_applet" = "xyes"; then + APPLET_TRUE= + APPLET_FALSE='#' +else + APPLET_TRUE='#' + APPLET_FALSE= +fi + # Extract the first word of "gconftool-2", so it can be a program name with args. set dummy gconftool-2; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_GCONFTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_GCONFTOOL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $GCONFTOOL in [\\/]* | ?:[\\/]*) @@ -15683,14 +14517,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -15698,11 +14532,11 @@ fi GCONFTOOL=$ac_cv_path_GCONFTOOL if test -n "$GCONFTOOL"; then - { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5 -echo "${ECHO_T}$GCONFTOOL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 +$as_echo "$GCONFTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -15715,14 +14549,14 @@ # Check whether --with-gconf-source was given. -if test "${with_gconf_source+set}" = set; then +if test "${with_gconf_source+set}" = set; then : withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" fi - { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 -echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 +$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' @@ -15730,22 +14564,20 @@ # Check whether --with-gconf-schema-file-dir was given. -if test "${with_gconf_schema_file_dir+set}" = set; then +if test "${with_gconf_schema_file_dir+set}" = set; then : withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" fi - { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 -echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 +$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } # Check whether --enable-schemas-install was given. -if test "${enable_schemas_install+set}" = set; then +if test "${enable_schemas_install+set}" = set; then : enableval=$enable_schemas_install; case ${enableval} in yes|no) ;; - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5 -echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;} - { (exit 1); exit 1; }; } ;; + *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; esac fi @@ -15759,19 +14591,14 @@ - -{ echo "$as_me:$LINENO: checking for bind in -lsocket" >&5 -echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6; } -if test "${ac_cv_lib_socket_bind+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5 +$as_echo_n "checking for bind in -lsocket... " >&6; } +if test "${ac_cv_lib_socket_bind+set}" = set; then : + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -15789,39 +14616,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_socket_bind=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_bind=no + ac_cv_lib_socket_bind=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_bind" >&6; } -if test $ac_cv_lib_socket_bind = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_bind" >&5 +$as_echo "$ac_cv_lib_socket_bind" >&6; } +if test "x$ac_cv_lib_socket_bind" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 _ACEOF @@ -15835,10 +14641,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PERL+set}" = set; then : + $as_echo_n "(cached) " >&6 else case $PERL in [\\/]* | ?:[\\/]*) @@ -15850,14 +14656,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -15865,11 +14671,11 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +$as_echo "$PERL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -15877,7 +14683,7 @@ done # Check whether --enable-rebuilds was given. -if test "${enable_rebuilds+set}" = set; then +if test "${enable_rebuilds+set}" = set; then : enableval=$enable_rebuilds; else enable_rebuilds=yes @@ -15891,9 +14697,31 @@ fi +# Plugins #******************************************************************************* +# +ACTIVE_PLUGINS="vnc" +if test "x$enable_ssh" = "xyes" ; then +ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh" +fi -ac_config_files="$ac_config_files Makefile data/Makefile data/vinagre.desktop.in data/vinagre-file.desktop.in data/icons/Makefile help/Makefile po/Makefile.in src/Makefile src/view/Makefile" + +VINAGRE_IMPLIB="-lvinagre-${VINAGRE_API_VERSION}" +PLUGIN_LIBTOOL_FLAGS="-module -avoid-version" +LOADER_LIBTOOL_FLAGS="-module -avoid-version" + + + + + +VINAGRE_PLUGINS_DATA_DIR="$datadir/vinagre-1/plugins" + + +VINAGRE_PLUGINS_LIBS_DIR="$libdir/vinagre-1/plugins" + + +#******************************************************************************* +ac_config_files="$ac_config_files Makefile data/Makefile data/vinagre.desktop.in data/vinagre-file.desktop.in data/vinagre.pc data/vinagre.schemas.in data/icons/Makefile help/Makefile po/Makefile.in plugin-loaders/Makefile plugin-loaders/c/Makefile plugins/Makefile plugins/vnc/Makefile plugins/ssh/Makefile vinagre/Makefile vinagre/view/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -15922,12 +14750,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -15935,8 +14764,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -15959,12 +14788,12 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -15980,91 +14809,86 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ac_config_commands="$ac_config_commands po/stamp-it" if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"ENABLE_SK\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"ENABLE_SK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AVAHI_TRUE}" && test -z "${AVAHI_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AVAHI\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AVAHI\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AVAHI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${SSH_TRUE}" && test -z "${SSH_FALSE}"; then + as_fn_error "conditional \"SSH\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TELEPATHY_TRUE}" && test -z "${TELEPATHY_FALSE}"; then + as_fn_error "conditional \"TELEPATHY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${APPLET_TRUE}" && test -z "${APPLET_FALSE}"; then + as_fn_error "conditional \"APPLET\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -16074,59 +14898,79 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi @@ -16135,20 +14979,18 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -16159,113 +15001,123 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then as_dirname=dirname @@ -16273,50 +15125,122 @@ as_dirname=false fi +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -16333,12 +15257,12 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else - case $1 in - -*)set "./$1";; + case $1 in #( + -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -16353,13 +15277,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vinagre $as_me 2.26.1, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by vinagre $as_me 2.29.1, which was +generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16372,7 +15302,16 @@ _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" @@ -16380,22 +15319,24 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -16406,16 +15347,16 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -vinagre config.status 2.26.1 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +vinagre config.status 2.29.1 +configured by $0, generated by GNU Autoconf 2.64, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16423,11 +15364,12 @@ srcdir='$srcdir' INSTALL='$INSTALL' MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -16449,34 +15391,38 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -16491,27 +15437,29 @@ fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -16525,10 +15473,10 @@ sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' +enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' -enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' @@ -16553,6 +15501,7 @@ lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' @@ -16658,6 +15607,7 @@ lt_SP2NL \ lt_NL2SP \ reload_flag \ +OBJDUMP \ deplibs_check_method \ file_magic_cmd \ AR \ @@ -16773,7 +15723,7 @@ _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -16787,16 +15737,21 @@ "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "data/vinagre.desktop.in") CONFIG_FILES="$CONFIG_FILES data/vinagre.desktop.in" ;; "data/vinagre-file.desktop.in") CONFIG_FILES="$CONFIG_FILES data/vinagre-file.desktop.in" ;; + "data/vinagre.pc") CONFIG_FILES="$CONFIG_FILES data/vinagre.pc" ;; + "data/vinagre.schemas.in") CONFIG_FILES="$CONFIG_FILES data/vinagre.schemas.in" ;; "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/view/Makefile") CONFIG_FILES="$CONFIG_FILES src/view/Makefile" ;; + "plugin-loaders/Makefile") CONFIG_FILES="$CONFIG_FILES plugin-loaders/Makefile" ;; + "plugin-loaders/c/Makefile") CONFIG_FILES="$CONFIG_FILES plugin-loaders/c/Makefile" ;; + "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; + "plugins/vnc/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/vnc/Makefile" ;; + "plugins/ssh/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/ssh/Makefile" ;; + "vinagre/Makefile") CONFIG_FILES="$CONFIG_FILES vinagre/Makefile" ;; + "vinagre/view/Makefile") CONFIG_FILES="$CONFIG_FILES vinagre/view/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -16823,7 +15778,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -16834,282 +15789,139 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -am__isrc!$am__isrc$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -MAINT!$MAINT$ac_delim -ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -DEPDIR!$DEPDIR$ac_delim -am__include!$am__include$ac_delim -am__quote!$am__quote$ac_delim -AMDEP_TRUE!$AMDEP_TRUE$ac_delim -AMDEP_FALSE!$AMDEP_FALSE$ac_delim -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LIBTOOL!$LIBTOOL$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -SED!$SED$ac_delim -FGREP!$FGREP$ac_delim -LD!$LD$ac_delim -DUMPBIN!$DUMPBIN$ac_delim -ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim -NM!$NM$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\r' +else + ac_cs_awk_cr=$ac_cr fi -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -LN_S!$LN_S$ac_delim -AR!$AR$ac_delim -RANLIB!$RANLIB$ac_delim -lt_ECHO!$lt_ECHO$ac_delim -DSYMUTIL!$DSYMUTIL$ac_delim -NMEDIT!$NMEDIT$ac_delim -LIPO!$LIPO$ac_delim -OTOOL!$OTOOL$ac_delim -OTOOL64!$OTOOL64$ac_delim -WARN_CFLAGS!$WARN_CFLAGS$ac_delim -GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim -USE_NLS!$USE_NLS$ac_delim -INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim -INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim -INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim -INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim -INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim -INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim -INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim -INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim -INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim -INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim -INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim -INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim -INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim -INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim -INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim -INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim -INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim -INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim -INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim -INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim -INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim -INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim -XGETTEXT!$XGETTEXT$ac_delim -MSGMERGE!$MSGMERGE$ac_delim -MSGFMT!$MSGFMT$ac_delim -GMSGFMT!$GMSGFMT$ac_delim -INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim -ALL_LINGUAS!$ALL_LINGUAS$ac_delim -DATADIRNAME!$DATADIRNAME$ac_delim -MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim -CATALOGS!$CATALOGS$ac_delim -CATOBJEXT!$CATOBJEXT$ac_delim -GMOFILES!$GMOFILES$ac_delim -INSTOBJEXT!$INSTOBJEXT$ac_delim -INTLLIBS!$INTLLIBS$ac_delim -PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim -PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim -POFILES!$POFILES$ac_delim -POSUB!$POSUB$ac_delim -MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -HELP_DIR!$HELP_DIR$ac_delim -OMF_DIR!$OMF_DIR$ac_delim -DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim -ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim -ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim -DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim -HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim -HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim -AVAHI_CFLAGS!$AVAHI_CFLAGS$ac_delim -AVAHI_LIBS!$AVAHI_LIBS$ac_delim -AVAHI_TRUE!$AVAHI_TRUE$ac_delim -AVAHI_FALSE!$AVAHI_FALSE$ac_delim -VINAGRE_CFLAGS!$VINAGRE_CFLAGS$ac_delim -VINAGRE_LIBS!$VINAGRE_LIBS$ac_delim -APPLET_CFLAGS!$APPLET_CFLAGS$ac_delim -APPLET_LIBS!$APPLET_LIBS$ac_delim -GCONFTOOL!$GCONFTOOL$ac_delim -GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim -GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim -GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim -GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim -PERL!$PERL$ac_delim -REBUILD!$REBUILD$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && _ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 +_ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and @@ -17126,20 +15938,128 @@ }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -17167,26 +16087,34 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -17196,42 +16124,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17249,20 +16142,15 @@ q } s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -17307,12 +16195,12 @@ esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -17320,36 +16208,37 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' $ac_file_inputs` in +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -17360,121 +16249,50 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # # CONFIG_HEADER # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else - rm -f $ac_file - mv "$tmp/config.h" $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else - echo "/* $configure_input */" - cat "$ac_result" + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 fi - rm -f "$tmp/out12" -# Compute $ac_file's index in $config_headers. -_am_arg=$ac_file +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in @@ -17489,7 +16307,7 @@ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -echo X"$_am_arg" | +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17509,30 +16327,40 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17550,68 +16378,33 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17629,16 +16422,12 @@ q } s/.*/./; q'` - test -d "$as_dir" && break + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" done -done +} ;; "libtool":C) @@ -17693,6 +16482,9 @@ # ### BEGIN LIBTOOL CONFIG +# Whether or not to build static libraries. +build_old_libs=$enable_static + # Which release of libtool.m4 was used? macro_version=$macro_version macro_revision=$macro_revision @@ -17700,9 +16492,6 @@ # Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static - # What type of objects to build. pic_mode=$pic_mode @@ -17762,6 +16551,9 @@ reload_flag=$lt_reload_flag reload_cmds=$lt_reload_cmds +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP + # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18276,10 +17068,8 @@ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; "po/stamp-it":C) - if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then - { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 -echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} - { (exit 1); exit 1; }; } + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then + as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -18302,11 +17092,13 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -18326,7 +17118,11 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi @@ -18334,7 +17130,7 @@ echo " -This is vinagre version 2.26.1 +This is vinagre version 2.29.1 Configure summary: @@ -18342,4 +17138,7 @@ Compiler Flags .............: ${CFLAGS} Avahi enabled ..............: ${enable_avahi} + GNOME Panel applet..........: ${enable_applet} + Telepathy support ..........: ${have_telepathy} + SSH plugin .................: ${enable_ssh} " diff -Nru vinagre-2.26.1/configure.ac vinagre-2.29.1/configure.ac --- vinagre-2.26.1/configure.ac 2009-03-17 00:28:40.000000000 +0000 +++ vinagre-2.29.1/configure.ac 2009-10-26 12:12:12.000000000 +0000 @@ -1,11 +1,17 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(vinagre, 2.26.1, http://projects.gnome.org/vinagre/) +AC_INIT(vinagre, 2.29.1, http://projects.gnome.org/vinagre/) + +VINAGRE_API_VERSION=1.0 +AC_SUBST(VINAGRE_API_VERSION) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE +# Use the silent-rules feature when possible. +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") @@ -13,6 +19,7 @@ AC_PROG_CC AM_PROG_CC_STDC AC_HEADER_STDC +AM_DISABLE_STATIC AM_PROG_LIBTOOL AM_PROG_CC_C_O @@ -36,12 +43,14 @@ GLIB_REQUIRED=2.17.0 GTK_REQUIRED=2.13.1 -LIBGLADE_REQUIRED=2.6.0 GCONF_REQUIRED=2.16.0 GTHREAD_REQUIRED=2.0.0 -GTK_VNC_REQUIRED=0.3.8 +GTK_VNC_REQUIRED=0.3.10 AVAHI_REQUIRED=0.6.22 PANEL_REQUIRED_VERSION=2.0.0 +TELEPATHY_GLIB_REQUIRED=0.7.31 +XML_REQUIRED=2.6.31 +VTE_REQUIRED=0.20 # Check for avahi AC_ARG_ENABLE(avahi, @@ -64,18 +73,76 @@ glib-2.0 >= $GLIB_REQUIRED \ gio-2.0 >= $GLIB_REQUIRED \ gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ gconf-2.0 >= $GCONF_REQUIRED \ gthread-2.0 >= $GTHREAD_REQUIRED \ gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED) + libxml-2.0 >= $XML_REQUIRED +) AC_SUBST(VINAGRE_CFLAGS) AC_SUBST(VINAGRE_LIBS) -PKG_CHECK_MODULES(APPLET, \ - libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION) -AC_SUBST(APPLET_CFLAGS) -AC_SUBST(APPLET_LIBS) +PKG_CHECK_MODULES(VNC, \ + gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED +) +AC_SUBST(VNC_CFLAGS) +AC_SUBST(VNC_LIBS) + +# Check for SSH +AC_ARG_ENABLE(ssh, + AS_HELP_STRING([--enable-ssh], + [Enable SSH plugin (default=no)]), + enable_ssh=${enableval}, + enable_ssh=no) + +if test "x$enable_ssh" = "xyes" ; then + PKG_CHECK_MODULES(SSH,\ + vte >= $VTE_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED) + AC_SUBST(VTE_CFLAGS) + AC_SUBST(VTE_LIBS) + AC_DEFINE([VINAGRE_ENABLE_SSH],[1],[We want ssh support]) +fi +AM_CONDITIONAL(SSH, test "x$enable_ssh" = "xyes") + +# Check for telepathy +AC_ARG_ENABLE(telepathy, + AS_HELP_STRING([--enable-telepathy=@<:@no/yes/auto@:>@], + [Enable telepathy checking]), , + enable_telepathy=auto) + +if test "x$enable_telepathy" != "xno"; then + PKG_CHECK_MODULES(TELEPATHY, + [ + telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + ], have_telepathy="yes", have_telepathy="no") + if test "x$have_telepathy" = "xyes"; then + AC_SUBST(TELEPATHY_CFLAGS) + AC_SUBST(TELEPATHY_LIBS) + AC_DEFINE(HAVE_TELEPATHY, [], [Define if you have telepathy]) + fi +else + have_telepathy=no +fi + +if test "x$enable_telepathy" = "xyes" -a "x$have_telepathy" != "xyes"; then + AC_MSG_ERROR([Couldn't find telepathy dependencies.]) +fi + +AM_CONDITIONAL(TELEPATHY, test "x$have_telepathy" = "xyes") + +# Enable/disable gnome-panel applet +AC_ARG_ENABLE(applet, + AS_HELP_STRING([--disable-applet], [Do not build the panel applet @<:@default=enabled@:>@]), + enable_applet=$enableval, + enable_applet=yes) + +if test "x$enable_applet" = "xyes";then + PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION) + AC_SUBST(APPLET_CFLAGS) + AC_SUBST(APPLET_LIBS) +fi +AM_CONDITIONAL(APPLET, test "x$enable_applet" = "xyes") dnl ================================================================ dnl GConf related settings @@ -99,18 +166,48 @@ fi AC_SUBST(REBUILD) +# Plugins #******************************************************************************* +# +dnl active plugins for vinagre.schemas +ACTIVE_PLUGINS="vnc" +if test "x$enable_ssh" = "xyes" ; then +ACTIVE_PLUGINS="$ACTIVE_PLUGINS,ssh" +fi +AC_SUBST(ACTIVE_PLUGINS) + +VINAGRE_IMPLIB="-lvinagre-${VINAGRE_API_VERSION}" +PLUGIN_LIBTOOL_FLAGS="-module -avoid-version" +LOADER_LIBTOOL_FLAGS="-module -avoid-version" +AC_SUBST(VINAGRE_IMPLIB) +AC_SUBST(PLUGIN_LIBTOOL_FLAGS) +AC_SUBST(LOADER_LIBTOOL_FLAGS) + +VINAGRE_PLUGINS_DATA_DIR="$datadir/vinagre-1/plugins" +AC_SUBST(VINAGRE_PLUGINS_DATA_DIR) + +VINAGRE_PLUGINS_LIBS_DIR="$libdir/vinagre-1/plugins" +AC_SUBST(VINAGRE_PLUGINS_LIBS_DIR) + +#******************************************************************************* AC_OUTPUT([ Makefile data/Makefile data/vinagre.desktop.in data/vinagre-file.desktop.in +data/vinagre.pc +data/vinagre.schemas.in data/icons/Makefile help/Makefile po/Makefile.in -src/Makefile -src/view/Makefile +plugin-loaders/Makefile +plugin-loaders/c/Makefile +plugins/Makefile +plugins/vnc/Makefile +plugins/ssh/Makefile +vinagre/Makefile +vinagre/view/Makefile ]) #******************************************************************************* @@ -125,4 +222,7 @@ Compiler Flags .............: ${CFLAGS} Avahi enabled ..............: ${enable_avahi} + GNOME Panel applet..........: ${enable_applet} + Telepathy support ..........: ${have_telepathy} + SSH plugin .................: ${enable_ssh} " diff -Nru vinagre-2.26.1/COPYING vinagre-2.29.1/COPYING --- vinagre-2.26.1/COPYING 2006-12-06 15:55:19.000000000 +0000 +++ vinagre-2.29.1/COPYING 2009-10-24 13:56:52.000000000 +0100 @@ -1,285 +1,626 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, 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 or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -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 give any other recipients of the Program a copy of this License -along with the Program. - -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 Program or any portion -of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -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 Program, 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 Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) 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; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, 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 executable. However, as a -special exception, the source code 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. - -If distribution of executable or 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 counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program 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. - - 5. 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 Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program 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 to + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + 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, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 7. 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 + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program 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 Program. - -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. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program 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. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 Program -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 Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, 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 - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), 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 Programs + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -287,15 +628,15 @@ To do so, attach the following notices to the program. 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 +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) - This program is free software; you can redistribute it and/or modify + This program 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 + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -304,37 +645,30 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff -Nru vinagre-2.26.1/data/icons/Makefile.am vinagre-2.29.1/data/icons/Makefile.am --- vinagre-2.26.1/data/icons/Makefile.am 2008-12-15 23:04:30.000000000 +0000 +++ vinagre-2.29.1/data/icons/Makefile.am 2009-08-25 01:56:42.000000000 +0100 @@ -99,3 +99,5 @@ install-data-local: install-icons update-icon-cache uninstall-local: uninstall-icons update-icon-cache + +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/data/icons/Makefile.in vinagre-2.29.1/data/icons/Makefile.in --- vinagre-2.26.1/data/icons/Makefile.in 2009-04-13 14:35:36.000000000 +0100 +++ vinagre-2.29.1/data/icons/Makefile.in 2009-10-26 13:35:25.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -41,14 +43,23 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = DATA = $(noinst_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLET_CFLAGS = @APPLET_CFLAGS@ APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ @@ -94,29 +105,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -124,6 +116,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -134,6 +127,7 @@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ @@ -143,10 +137,12 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -156,11 +152,23 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ @@ -212,6 +220,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ NULL = @@ -270,14 +279,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/icons/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/icons/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -295,6 +304,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -324,13 +334,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -358,6 +372,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -376,6 +391,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -384,18 +401,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -481,6 +508,9 @@ install-data-local: install-icons update-icon-cache uninstall-local: uninstall-icons update-icon-cache + +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru vinagre-2.26.1/data/Makefile.am vinagre-2.29.1/data/Makefile.am --- vinagre-2.26.1/data/Makefile.am 2008-06-14 01:04:26.000000000 +0100 +++ vinagre-2.29.1/data/Makefile.am 2009-10-26 12:01:02.000000000 +0000 @@ -1,12 +1,15 @@ SUBDIRS = icons -gladedir = $(datadir)/vinagre -glade_DATA = vinagre.glade - man_MANS = vinagre.1 +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = vinagre-@VINAGRE_API_VERSION@.pc + +vinagre-@VINAGRE_API_VERSION@.pc: vinagre.pc + cp vinagre.pc vinagre-@VINAGRE_API_VERSION@.pc + uidir = $(datadir)/vinagre -ui_DATA = vinagre-ui.xml GNOME_VinagreApplet.xml +ui_DATA = vinagre-ui.xml GNOME_VinagreApplet.xml vinagre.ui vinagre-fav-ui.xml @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications @@ -37,7 +40,9 @@ CLEANFILES = \ $(desktop_DATA) \ $(mime_DATA) \ - $(schemas_DATA) + $(schemas_DATA) \ + $(pkgconfig_DATA) \ + org.gnome.Empathy.StreamTubeHandler.rfb.service EXTRA_DIST = \ $(glade_DATA) \ @@ -45,7 +50,21 @@ $(ui_DATA) \ $(desktop_in_files) \ $(MIMEFILES) \ - $(schemas_in_files) + $(schemas_in_files) \ + vinagre.pc.in \ + vinagre.schemas.in.in \ + org.gnome.Empathy.StreamTubeHandler.rfb.service.in + +if TELEPATHY + +servicedir = $(datadir)/dbus-1/services +service_DATA = org.gnome.Empathy.StreamTubeHandler.rfb.service + +org.gnome.Empathy.StreamTubeHandler.rfb.service: org.gnome.Empathy.StreamTubeHandler.rfb.service.in \ + Makefile + @sed -e "s|[@]bindir[@]|$(bindir)|" $< > $@ + +endif UPDATE_MIME = \ if [ -f $(DESTDIR)$(datadir)/mime/packages/freedesktop.org.xml ] ; then \ @@ -68,3 +87,5 @@ uninstall-hook: $(UPDATE_MIME) $(UPDATE_DESKTOP) + +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/data/Makefile.in vinagre-2.29.1/data/Makefile.in --- vinagre-2.26.1/data/Makefile.in 2009-04-13 14:35:36.000000000 +0100 +++ vinagre-2.29.1/data/Makefile.in 2009-10-26 13:35:25.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -35,14 +37,23 @@ subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/vinagre-file.desktop.in.in \ - $(srcdir)/vinagre.desktop.in.in + $(srcdir)/vinagre.desktop.in.in $(srcdir)/vinagre.pc.in \ + $(srcdir)/vinagre.schemas.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = vinagre.desktop.in vinagre-file.desktop.in +CONFIG_CLEAN_FILES = vinagre.desktop.in vinagre-file.desktop.in \ + vinagre.pc vinagre.schemas.in +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -52,35 +63,76 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(mimedir)" \ - "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(uidir)" -NROFF = nroff -MANS = $(man_MANS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -desktopDATA_INSTALL = $(INSTALL_DATA) -gladeDATA_INSTALL = $(INSTALL_DATA) -mimeDATA_INSTALL = $(INSTALL_DATA) -schemasDATA_INSTALL = $(INSTALL_DATA) -uiDATA_INSTALL = $(INSTALL_DATA) -DATA = $(desktop_DATA) $(glade_DATA) $(mime_DATA) $(schemas_DATA) \ - $(ui_DATA) +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +man1dir = $(mandir)/man1 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(servicedir)" \ + "$(DESTDIR)$(uidir)" +NROFF = nroff +MANS = $(man_MANS) +DATA = $(desktop_DATA) $(mime_DATA) $(pkgconfig_DATA) $(schemas_DATA) \ + $(service_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLET_CFLAGS = @APPLET_CFLAGS@ APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ @@ -126,29 +178,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -156,6 +189,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -166,6 +200,7 @@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ @@ -175,10 +210,12 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -188,11 +225,23 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ @@ -244,14 +293,15 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = icons -gladedir = $(datadir)/vinagre -glade_DATA = vinagre.glade man_MANS = vinagre.1 +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = vinagre-@VINAGRE_API_VERSION@.pc uidir = $(datadir)/vinagre -ui_DATA = vinagre-ui.xml GNOME_VinagreApplet.xml +ui_DATA = vinagre-ui.xml GNOME_VinagreApplet.xml vinagre.ui vinagre-fav-ui.xml desktopdir = $(datadir)/applications desktop_in_files = vinagre.desktop.in vinagre-file.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -264,7 +314,9 @@ CLEANFILES = \ $(desktop_DATA) \ $(mime_DATA) \ - $(schemas_DATA) + $(schemas_DATA) \ + $(pkgconfig_DATA) \ + org.gnome.Empathy.StreamTubeHandler.rfb.service EXTRA_DIST = \ $(glade_DATA) \ @@ -272,8 +324,13 @@ $(ui_DATA) \ $(desktop_in_files) \ $(MIMEFILES) \ - $(schemas_in_files) + $(schemas_in_files) \ + vinagre.pc.in \ + vinagre.schemas.in.in \ + org.gnome.Empathy.StreamTubeHandler.rfb.service.in +@TELEPATHY_TRUE@servicedir = $(datadir)/dbus-1/services +@TELEPATHY_TRUE@service_DATA = org.gnome.Empathy.StreamTubeHandler.rfb.service UPDATE_MIME = \ if [ -f $(DESTDIR)$(datadir)/mime/packages/freedesktop.org.xml ] ; then \ if which update-mime-database>/dev/null 2>&1; then \ @@ -295,14 +352,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -320,146 +377,179 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): vinagre.desktop.in: $(top_builddir)/config.status $(srcdir)/vinagre.desktop.in.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ vinagre-file.desktop.in: $(top_builddir)/config.status $(srcdir)/vinagre-file.desktop.in.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +vinagre.pc: $(top_builddir)/config.status $(srcdir)/vinagre.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +vinagre.schemas.in: $(top_builddir)/config.status $(srcdir)/vinagre.schemas.in.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs -install-man1: $(man1_MANS) $(man_MANS) +install-man1: $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ + @list=''; test -n "$(man1dir)" || exit 0; \ + { for i in $$list; do echo "$$i"; done; \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + uninstall-man1: @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done + @list=''; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + test -z "$$files" || { \ + echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" - @list='$(desktop_DATA)'; for p in $$list; do \ + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ - $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ done uninstall-desktopDATA: @$(NORMAL_UNINSTALL) - @list='$(desktop_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ - rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ - done -install-gladeDATA: $(glade_DATA) + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(desktopdir)" && rm -f $$files +install-mimeDATA: $(mime_DATA) @$(NORMAL_INSTALL) - test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" - @list='$(glade_DATA)'; for p in $$list; do \ + test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)" + @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \ - $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \ done -uninstall-gladeDATA: +uninstall-mimeDATA: @$(NORMAL_UNINSTALL) - @list='$(glade_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \ - rm -f "$(DESTDIR)$(gladedir)/$$f"; \ - done -install-mimeDATA: $(mime_DATA) + @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(mimedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(mimedir)" && rm -f $$files +install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)" - @list='$(mime_DATA)'; for p in $$list; do \ + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(mimeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimedir)/$$f'"; \ - $(mimeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimedir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ done -uninstall-mimeDATA: +uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) - @list='$(mime_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(mimedir)/$$f'"; \ - rm -f "$(DESTDIR)$(mimedir)/$$f"; \ - done + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files install-schemasDATA: $(schemas_DATA) @$(NORMAL_INSTALL) test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)" - @list='$(schemas_DATA)'; for p in $$list; do \ + @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(schemasDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemasdir)/$$f'"; \ - $(schemasDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemasdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemasdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(schemasdir)" || exit $$?; \ done uninstall-schemasDATA: @$(NORMAL_UNINSTALL) - @list='$(schemas_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(schemasdir)/$$f'"; \ - rm -f "$(DESTDIR)$(schemasdir)/$$f"; \ + @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(schemasdir)" && rm -f $$files +install-serviceDATA: $(service_DATA) + @$(NORMAL_INSTALL) + test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" + @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(servicedir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(servicedir)" || exit $$?; \ done + +uninstall-serviceDATA: + @$(NORMAL_UNINSTALL) + @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(servicedir)" && rm -f $$files install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" - @list='$(ui_DATA)'; for p in $$list; do \ + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \ - $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ done uninstall-uiDATA: @$(NORMAL_UNINSTALL) - @list='$(ui_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \ - rm -f "$(DESTDIR)$(uidir)/$$f"; \ - done + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(uidir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -485,7 +575,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -519,16 +609,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -536,14 +626,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -555,7 +645,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -564,34 +654,52 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) + @list='$(MANS)'; if test -n "$$list"; then \ + list=`for p in $$list; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ + if test -n "$$list" && \ + grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ + echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ + echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ + echo " typically \`make maintainer-clean' will remove them" >&2; \ + exit 1; \ + else :; fi; \ + else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -607,29 +715,44 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -639,7 +762,7 @@ all-am: Makefile $(MANS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(uidir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -663,6 +786,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -681,30 +805,41 @@ html: html-recursive +html-am: + info: info-recursive info-am: -install-data-am: install-data-local install-desktopDATA \ - install-gladeDATA install-man install-mimeDATA \ - install-schemasDATA install-uiDATA +install-data-am: install-data-local install-desktopDATA install-man \ + install-mimeDATA install-pkgconfigDATA install-schemasDATA \ + install-serviceDATA install-uiDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook - install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-man1 install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -723,15 +858,16 @@ ps-am: -uninstall-am: uninstall-desktopDATA uninstall-gladeDATA uninstall-man \ - uninstall-mimeDATA uninstall-schemasDATA uninstall-uiDATA +uninstall-am: uninstall-desktopDATA uninstall-man uninstall-mimeDATA \ + uninstall-pkgconfigDATA uninstall-schemasDATA \ + uninstall-serviceDATA uninstall-uiDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook - uninstall-man: uninstall-man1 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-data-am install-strip uninstall-am +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-data-am install-strip tags-recursive \ + uninstall-am .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ @@ -740,18 +876,22 @@ html-am info info-am install install-am install-data \ install-data-am install-data-hook install-data-local \ install-desktopDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-gladeDATA install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-mimeDATA install-pdf install-pdf-am install-ps \ - install-ps-am install-schemasDATA install-strip install-uiDATA \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-desktopDATA uninstall-gladeDATA uninstall-hook \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man1 install-mimeDATA \ + install-pdf install-pdf-am install-pkgconfigDATA install-ps \ + install-ps-am install-schemasDATA install-serviceDATA \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-desktopDATA uninstall-hook \ uninstall-man uninstall-man1 uninstall-mimeDATA \ - uninstall-schemasDATA uninstall-uiDATA + uninstall-pkgconfigDATA uninstall-schemasDATA \ + uninstall-serviceDATA uninstall-uiDATA + +vinagre-@VINAGRE_API_VERSION@.pc: vinagre.pc + cp vinagre.pc vinagre-@VINAGRE_API_VERSION@.pc @INTLTOOL_DESKTOP_RULE@ @@ -766,6 +906,10 @@ @GCONF_SCHEMAS_INSTALL_TRUE@ fi @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: +@TELEPATHY_TRUE@org.gnome.Empathy.StreamTubeHandler.rfb.service: org.gnome.Empathy.StreamTubeHandler.rfb.service.in \ +@TELEPATHY_TRUE@ Makefile +@TELEPATHY_TRUE@ @sed -e "s|[@]bindir[@]|$(bindir)|" $< > $@ + install-data-hook: $(UPDATE_MIME) $(UPDATE_DESKTOP) @@ -773,6 +917,9 @@ uninstall-hook: $(UPDATE_MIME) $(UPDATE_DESKTOP) + +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru vinagre-2.26.1/data/org.gnome.Empathy.StreamTubeHandler.rfb.service.in vinagre-2.29.1/data/org.gnome.Empathy.StreamTubeHandler.rfb.service.in --- vinagre-2.26.1/data/org.gnome.Empathy.StreamTubeHandler.rfb.service.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/data/org.gnome.Empathy.StreamTubeHandler.rfb.service.in 2009-08-10 13:25:15.000000000 +0100 @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.gnome.Empathy.StreamTubeHandler.rfb +Exec=@bindir@/vinagre diff -Nru vinagre-2.26.1/data/vinagre.1 vinagre-2.29.1/data/vinagre.1 --- vinagre-2.26.1/data/vinagre.1 2009-01-30 20:05:21.000000000 +0000 +++ vinagre-2.29.1/data/vinagre.1 2009-08-12 13:54:11.000000000 +0100 @@ -1,12 +1,14 @@ -.TH VINAGRE "1" "November 23rd 2008" "User Commands" +.TH VINAGRE "1" "August 12th 2009" "User Commands" .SH "NAME" -vinagre \- a VNC client for the GNOME Desktop +vinagre \- a remote desktop viewer for the GNOME Desktop .SH "SYNOPSYS" .PP -\fBvinagre\fR [\fBOPTIONS\fR] [\fB\fIserver\fR[:\fIport\fR]\fR] +\fBvinagre\fR [\fBOPTIONS\fR] [\fB\fIserver\fR]\fR[::\fIport\fR|:display\fR] .SH "DESCRIPTION" .PP -\fBvinagre\fR is a VNC client for the GNOME desktop, featuring, among others:\&. +\fBvinagre\fR is a remote desktop viewer for the GNOME desktop. It can support +many protocols using a plugin system. Current plugins exist for VNC and SSH. +Vinagre has many features, among others:\&. .PP - Support for multiple connections simultaneously .PP @@ -29,15 +31,18 @@ Show all help options .TP \fB\-\-help\-gtk\fR -Show GTK+ Options +Show GTK+ options .SS "Application Options:" .TP -\fB\-\-gtk\-vnc\-debug\fR -Enables debug output +\fB\-\-help\-vnc\fR +Show VNC options .TP -\fB\-f\fR, \fB\-\-file\fR=\fIfilename\fR +\fB\-F\fR, \fB\-\-file\fR=\fIfilename\fR Opens a .vnc file .TP +\fB\-f\fR, \fB\-\-fullscreen\fR +Open vinagre in fullscreen mode +.TP \-n, \fB\-\-new\-window\fR Create a new toplevel window in an existing instance of vinagre .TP @@ -49,8 +54,19 @@ .PP The following operands are supported: .TP -\fB\fB\fIserver\fR[:\fIport\fR]\fR\fR -Specifies the VNC server to connect with\&. The VNC server name or IP address is followed by a colon (:) character, and then followed by the VNC port number\&. The port specification is optional\&. If it is not specified, default value of 5900 will be used\&. If the value is lower than 1024, it will add 5900\&. For example, ":0" means "5900" and ":1" means ":5901"\&. +\fB\fB\fI\fR[server\fR]\fR[::\fIport|:display\fR]\fR\fR +Specifies the VNC server to connect to\&. The VNC server can be either a +hostname, or an IP address. If the server is an IPv6 address, it must be +enclosed by square brackets. The address can optionally be followed by two +colons (::) and the VNC port number\&, or alternatively by one colon (:) and +the display where Vinagre should run. If a port is not specified, default +value of 5900 will be used\&. +If the value is lower than 1024, 5900 will be added to it\&. For example, ":0" +means "5900" and ":1" means ":5901"\&. If only a port is specified, but not +the hostname, localhost will be assumed. +Possible values for the display are between 0 and 1024. If a display number +greater than 1024 is specified, it will be assumed to be a port. +Note that you can't specify the port and the display at the same time. .SH "EXAMPLES" .PP \fBExample 1: Start vinagre from the command line\fR @@ -71,14 +87,35 @@ .PP .PP .nf -example% \fBvinagre snoopy:5900\fR +example% \fBvinagre snoopy::5900\fR +.fi +.PP +\fBExample 4: Connect to a specified IPv4 address and port\fR +.PP +.PP +.nf +example% \fBvinagre 192.168.1.35::2700 +.fi +.PP +\fBExample 5: Connect to a specified IPv6 address and port\fR +.PP +.PP +.nf +example% \fBvinagre [2001:0db8:0:0:0:0:1428:57ab]::2700 +.fi +.PP +\fBExample 6: Connect to a VNC server specified by a \&.vnc file\fR +.PP +.PP +.nf +example% \fBvinagre \-F snoopy\&.vnc\fR .fi .PP -\fBExample 4: Connect to a VNC server specified by a \&.vnc file\fR +\fBExample 7: Connect to localhost on a specified port in fullscreen mode\fR .PP .PP .nf -example% \fBvinagre \-f snoopy\&.vnc\fR +example% \fBvinagre -f ::5900 .fi .SH "SEE ALSO" .PP diff -Nru vinagre-2.26.1/data/vinagre.desktop.in vinagre-2.29.1/data/vinagre.desktop.in --- vinagre-2.26.1/data/vinagre.desktop.in 2009-04-13 14:35:50.000000000 +0100 +++ vinagre-2.29.1/data/vinagre.desktop.in 2009-10-26 13:35:34.000000000 +0000 @@ -11,4 +11,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=vinagre X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=2.26.1 +X-GNOME-Bugzilla-Version=2.29.1 diff -Nru vinagre-2.26.1/data/vinagre-fav-ui.xml vinagre-2.29.1/data/vinagre-fav-ui.xml --- vinagre-2.26.1/data/vinagre-fav-ui.xml 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/data/vinagre-fav-ui.xml 2009-10-24 22:40:25.000000000 +0100 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru vinagre-2.26.1/data/vinagre-file.desktop.in vinagre-2.29.1/data/vinagre-file.desktop.in --- vinagre-2.26.1/data/vinagre-file.desktop.in 2009-04-13 14:35:50.000000000 +0100 +++ vinagre-2.29.1/data/vinagre-file.desktop.in 2009-10-26 13:35:34.000000000 +0000 @@ -1,16 +1,15 @@ [Desktop Entry] _Name=Remote Desktop Viewer _Comment=Access remote desktops -Exec=vinagre -f %U +Exec=vinagre -F %U Icon=vinagre Terminal=false Type=Application StartupNotify=true MimeType=application/x-vnc; -Categories=GNOME;GTK;Network;RemoteAccess; OnlyShowIn=GNOME; NoDisplay=true X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=vinagre X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=2.26.1 +X-GNOME-Bugzilla-Version=2.29.1 diff -Nru vinagre-2.26.1/data/vinagre-file.desktop.in.in vinagre-2.29.1/data/vinagre-file.desktop.in.in --- vinagre-2.26.1/data/vinagre-file.desktop.in.in 2008-02-15 18:43:08.000000000 +0000 +++ vinagre-2.29.1/data/vinagre-file.desktop.in.in 2009-08-10 18:34:03.000000000 +0100 @@ -1,13 +1,12 @@ [Desktop Entry] _Name=Remote Desktop Viewer _Comment=Access remote desktops -Exec=vinagre -f %U +Exec=vinagre -F %U Icon=vinagre Terminal=false Type=Application StartupNotify=true MimeType=application/x-vnc; -Categories=GNOME;GTK;Network;RemoteAccess; OnlyShowIn=GNOME; NoDisplay=true X-GNOME-Bugzilla-Bugzilla=GNOME diff -Nru vinagre-2.26.1/data/vinagre.glade vinagre-2.29.1/data/vinagre.glade --- vinagre-2.26.1/data/vinagre.glade 2009-03-20 13:02:20.000000000 +0000 +++ vinagre-2.29.1/data/vinagre.glade 1970-01-01 01:00:00.000000000 +0100 @@ -1,1063 +0,0 @@ - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - False - True - center-on-parent - True - dialog - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Which machine do you want to connect to?</b> - True - - - False - False - 6 - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - 6 - 6 - - - gtk-find - True - False - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - False - - - 3 - 4 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - _Host: - True - host_entry - - - 1 - 2 - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - GTK_FILL - - - - - - 250 - True - host or host:display or host::port - - - 2 - 3 - - - - - - 4 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Connection options</b> - True - - - False - False - 6 - 4 - - - - - True - 3 - 2 - 6 - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - - - - - - _Full screen - True - True - False - True - True - - - 1 - 2 - - - - - _View only - True - True - False - True - True - - - 1 - 2 - 1 - 2 - - - - - _Scaling - True - True - False - True - True - - - 1 - 2 - 2 - 3 - - - - - - - - - - - 5 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - end - - - gtk-cancel - -6 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 0 - - - - - gtk-connect - -5 - True - True - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 1 - - - - - False - end - 0 - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - False - True - center-on-parent - True - dialog - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Authentication is required</b> - True - True - - - 6 - 0 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - 3 - 5 - 5 - - - True - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 254 - True - - - 2 - 3 - 1 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - _Username: - True - username_entry - - - 1 - 2 - 1 - 2 - - - - - _Remember this credential - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - True - - - 2 - 3 - 4 - 5 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - True - - - 2 - 3 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8 - False - True - - - 2 - 3 - 2 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - _Password: - True - password_entry - - - 1 - 2 - 2 - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Host: - True - password_entry - - - 1 - 2 - - - - - True - 0 - <i><small>All fields above are mandatory</small></i> - True - - - 1 - 3 - 3 - 4 - - - - - - - - - - - - - - - - - - - - 1 - - - - - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - end - - - gtk-cancel - -6 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 0 - - - - - _Authenticate - -5 - True - False - True - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 1 - - - - - False - end - 0 - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - Bookmarks - True - center-on-parent - True - dialog - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Connection</b> - True - - - False - False - 6 - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 3 - 6 - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - _Name: - True - edit_bookmark_name_entry - - - 1 - 2 - GTK_FILL - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - _Host: - True - edit_bookmark_host_entry - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - 250 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 2 - 3 - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - host or host:display or host::port - True - - - 2 - 3 - 1 - 2 - - - - - - - - False - False - 3 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Options</b> - True - - - False - False - 6 - 4 - - - - - True - 3 - 2 - 6 - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - - - - - - _Full screen - True - True - False - True - True - - - 1 - 2 - - - - - _View only - True - True - False - True - True - - - 1 - 2 - 1 - 2 - - - - - _Scaling - True - True - False - True - True - - - 1 - 2 - 2 - 3 - - - - - - - - - - - False - False - 5 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Folder</b> - True - - - False - False - 6 - 6 - - - - - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - False - False - 0 - - - - - - - - 7 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - end - - - gtk-cancel - -6 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 0 - - - - - gtk-save - -5 - True - True - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 1 - - - - - False - end - 0 - - - - - - - 5 - Preferences - False - True - center-on-parent - True - dialog - False - - - True - - - True - 6 - - - True - 0 - <b>Interface</b> - True - - - False - False - 0 - - - - - True - 12 - - - True - - - - False - False - 0 - - - - - True - 6 - - - _Always show tabs - True - True - False - Whether we should show tabs even when there is only one active connection - True - 0 - True - - - False - False - 0 - - - - - _Show menu shortcuts - True - True - False - Whether we should show the menu accelerators (shortcut keys) - True - 0 - True - - - False - False - 1 - - - - - False - 1 - - - - - 1 - - - - - False - 6 - 1 - - - - - True - end - - - gtk-close - True - True - True - True - - - 0 - - - - - False - end - 0 - - - - - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - Bookmarks - True - center-on-parent - True - dialog - False - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Folder</b> - True - - - False - False - 6 - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 6 - 6 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - _Name: - True - edit_bookmark_folder_name_entry - - - 1 - 2 - GTK_FILL - - - - - - 250 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 2 - 3 - - - - - False - False - 2 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - <b>Parent Folder</b> - True - - - False - False - 6 - 3 - - - - - True - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - False - False - 0 - - - - - - - - 4 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - end - - - gtk-cancel - -6 - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 0 - - - - - gtk-save - -5 - True - True - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - 1 - - - - - False - end - 0 - - - - - - diff -Nru vinagre-2.26.1/data/vinagre.pc.in vinagre-2.29.1/data/vinagre.pc.in --- vinagre-2.26.1/data/vinagre.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/data/vinagre.pc.in 2009-07-30 01:42:36.000000000 +0100 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: vinagre +Description: vinagre +Requires: gtk+-2.0 libxml-2.0 +Version: @VERSION@ +Cflags: -I${includedir}/vinagre-@VINAGRE_API_VERSION@ +Libs: diff -Nru vinagre-2.26.1/data/vinagre.schemas.in vinagre-2.29.1/data/vinagre.schemas.in --- vinagre-2.26.1/data/vinagre.schemas.in 2008-11-14 19:44:33.000000000 +0000 +++ vinagre-2.29.1/data/vinagre.schemas.in 2009-10-26 13:35:34.000000000 +0000 @@ -1,5 +1,18 @@ + + /schemas/apps/vinagre/plugins/active-plugins + /apps/vinagre/plugins/active-plugins + vinagre + list + string + [dummy] + + Active plugins + List of active plugins. It contains the "Location" of the active plugins. See the .vinagre-plugin file for obtaining + the "Location" of a given plugin. + + /schemas/desktop/gnome/url-handlers/vnc/command @@ -85,5 +98,19 @@ + + /schemas/apps/vinagre/plugins/active-plugins + /apps/vinagre/plugins/active-plugins + vinagre + list + string + [vnc] + + Active plugins + List of active plugins. It contains the "Location" of the active plugins. See the .vinagre-plugin file for obtaining + the "Location" of a given plugin. + + + diff -Nru vinagre-2.26.1/data/vinagre.schemas.in.in vinagre-2.29.1/data/vinagre.schemas.in.in --- vinagre-2.26.1/data/vinagre.schemas.in.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/data/vinagre.schemas.in.in 2009-07-27 12:59:29.000000000 +0100 @@ -0,0 +1,116 @@ + + + + /schemas/apps/vinagre/plugins/active-plugins + /apps/vinagre/plugins/active-plugins + vinagre + list + string + [dummy] + + Active plugins + List of active plugins. It contains the "Location" of the active plugins. See the .vinagre-plugin file for obtaining + the "Location" of a given plugin. + + + + + /schemas/desktop/gnome/url-handlers/vnc/command + /desktop/gnome/url-handlers/vnc/command + vinagre + string + vinagre %s + + The handler for "vnc://" URLs + + + + + + /schemas/desktop/gnome/url-handlers/vnc/needs_terminal + /desktop/gnome/url-handlers/vnc/needs_terminal + vinagre + bool + false + + + + + + + + /schemas/desktop/gnome/url-handlers/vnc/enabled + /desktop/gnome/url-handlers/vnc/enabled + vinagre + bool + true + + + + + + + + /schemas/apps/vinagre/shared_flag + /apps/vinagre/shared_flag + vinagre + bool + true + + Whether we should leave other clients connected + When connecting to a host, the client can say to the server to leave other clients connected or to drop the existent connections. Set the value to true to share the desktop with the other clients. + + + + + /schemas/apps/vinagre/always_show_tabs + /apps/vinagre/always_show_tabs + vinagre + bool + false + + Whether we should show tabs even when there is only one active connection + Set to "true" to always show the tabs. Set to "false" to only show the tabs when there is more than one active connection. + + + + + /schemas/apps/vinagre/show_accels + /apps/vinagre/show_accels + vinagre + bool + false + + Whether we should show the menu accelerators (shortcut keys) + Set to "false" to disable menu shortcuts. Set to "true" to enable them. Note that if they are enabled, those keys will be intercepted by the menu and will not be sent to the remote host. + + + + + /schemas/apps/vinagre/history_size + /apps/vinagre/history_size + vinagre + int + 15 + + Maximum number of history items in connect dialog + Specifies the maximum number of items in the host dropdown entry. + + + + + /schemas/apps/vinagre/plugins/active-plugins + /apps/vinagre/plugins/active-plugins + vinagre + list + string + [@ACTIVE_PLUGINS@] + + Active plugins + List of active plugins. It contains the "Location" of the active plugins. See the .vinagre-plugin file for obtaining + the "Location" of a given plugin. + + + + + diff -Nru vinagre-2.26.1/data/vinagre.ui vinagre-2.29.1/data/vinagre.ui --- vinagre-2.26.1/data/vinagre.ui 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/data/vinagre.ui 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,1123 @@ + + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + False + True + center-on-parent + True + dialog + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Which machine do you want to connect to? + + + + + + False + False + 6 + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 4 + 6 + 6 + + + gtk-find + True + False + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + + + 3 + 4 + 1 + 2 + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Host: + True + host_entry + + + 1 + 2 + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + GTK_FILL + + + + + + 250 + True + + + 2 + 3 + 1 + 2 + + + + + + True + 0 + _Protocol: + True + protocol_combo + + + 1 + 2 + + + + + True + + + True + + + 0 + + + + + True + 0 + 5 + + + + + + + 1 + + + + + 2 + 4 + + + + + + + + 4 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Connection options + + + + + + False + False + 6 + 4 + + + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + False + False + 0 + + + + + _Full screen + True + True + False + True + True + + + 1 + + + + + 5 + + + + + True + vertical + + + + + + 6 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + gtk-cancel + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 0 + + + + + gtk-connect + True + False + True + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button1 + connect_button + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + False + True + center-on-parent + True + dialog + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Authentication is required + True + + + + + + 6 + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 4 + 3 + 5 + 5 + + + True + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 254 + True + + + 2 + 3 + 1 + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Username: + True + username_entry + + + 1 + 2 + 1 + 2 + + + + + _Remember this credential + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True + + + 2 + 3 + 3 + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + + + + 2 + 3 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 8 + False + True + + + 2 + 3 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Password: + True + password_entry + + + 1 + 2 + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Host: + True + password_entry + + + 1 + 2 + + + + + + + + + + + + + + + + + 1 + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + gtk-cancel + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 0 + + + + + _Authenticate + True + False + True + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button3 + ok_button + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Bookmarks + True + center-on-parent + True + dialog + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 + + + True + vertical + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Connection + + + + + + False + False + 6 + 0 + + + + + True + 0 + Protocol: VNC + + + + + + + 1 + + + + + 0 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 + 3 + 6 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Name: + True + edit_bookmark_name_entry + + + 1 + 2 + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Host: + True + edit_bookmark_host_entry + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + 250 + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + True + + + 2 + 3 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + ● + True + + + 2 + 3 + 1 + 2 + + + + + + + + False + False + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Options + + + + + + False + False + 6 + 2 + + + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + False + False + 0 + + + + + _Full screen + True + True + False + True + True + + + 1 + + + + + 3 + + + + + True + vertical + + + + + + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Folder + + + + + + False + False + 6 + 5 + + + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + False + False + 0 + + + + + + + + 6 + + + + + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + gtk-cancel + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 0 + + + + + gtk-save + True + True + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button7 + save_button_edit_conn + + + + 5 + Preferences + False + True + center-on-parent + True + dialog + False + + + True + vertical + + + True + vertical + 6 + + + True + 0 + Interface + + + + + + False + False + 0 + + + + + True + 12 + + + True + + + + False + False + 0 + + + + + True + vertical + 6 + + + _Always show tabs + True + True + False + True + 0 + True + + + False + False + 0 + + + + + _Show menu shortcuts + True + True + False + True + 0 + True + + + False + False + 1 + + + + + False + 1 + + + + + 1 + + + + + False + 6 + 1 + + + + + True + end + + + gtk-close + True + True + True + True + + + False + False + 0 + + + + + False + end + 0 + + + + + + button9 + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Bookmarks + True + center-on-parent + True + dialog + False + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Folder + + + + + + False + False + 6 + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 + 6 + 6 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + _Name: + True + edit_bookmark_folder_name_entry + + + 1 + 2 + GTK_FILL + + + + + + 250 + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + 2 + 3 + + + + + False + False + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Parent Folder + + + + + + False + False + 6 + 3 + + + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + + False + False + 0 + + + + + + + + 4 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + gtk-cancel + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 0 + + + + + gtk-save + True + True + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + button5 + save_button + + + diff -Nru vinagre-2.26.1/data/vinagre-ui.xml vinagre-2.29.1/data/vinagre-ui.xml --- vinagre-2.26.1/data/vinagre-ui.xml 2008-12-11 16:58:34.000000000 +0000 +++ vinagre-2.29.1/data/vinagre-ui.xml 2009-10-26 11:47:40.000000000 +0000 @@ -2,7 +2,7 @@ * vinagre-ui.xml * This file is part of vinagre * - * Copyright (C) 2007,2008 - Jonh Wendell + * Copyright (C) 2007,2008,2009 - Jonh Wendell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ - + @@ -38,6 +38,7 @@ + @@ -46,18 +47,11 @@ - - - - - - - @@ -75,27 +69,7 @@ - - - - - - - - - - - - - - - - - - - - - + diff -Nru vinagre-2.26.1/debian/changelog vinagre-2.29.1/debian/changelog --- vinagre-2.26.1/debian/changelog 2009-12-18 09:12:10.000000000 +0000 +++ vinagre-2.29.1/debian/changelog 2009-12-18 09:12:11.000000000 +0000 @@ -1,73 +1,123 @@ -vinagre (2.26.1-0ubuntu1) jaunty; urgency=low +vinagre (2.29.1-0ubuntu1~ppa1~jaunty1) jaunty; urgency=low - * New upstream release: (LP: #360566) - - #574134 - Don't allow items name duplicated on bookmarks. - - udpated translations + * Backport for jaunty. No source changes, adjust for xulrunner 1.9.0 - -- Didier Roche Mon, 13 Apr 2009 17:55:48 +0200 + -- David Fraser Fri, 18 Dec 2009 05:34:30 +0200 -vinagre (2.26.0-0ubuntu1) jaunty; urgency=low +vinagre (2.29.1-0ubuntu1~ppa1~karmic1) karmic; urgency=low - * New upstream release: (LP: #344080) - - updated translations - * Re-generate debian/patches/02_autoconf.patch + * Backport for karmic. No source changes. - -- Didier Roche Tue, 17 Mar 2009 09:40:53 +0100 + -- bojo42 Mon, 07 Dec 2009 19:54:23 +0100 -vinagre (2.25.92-0ubuntu1) jaunty; urgency=low +vinagre (2.29.1-0ubuntu1) lucid; urgency=low - * New upstream release (LP: #36927) - - Improved the authentication dialog. - - Allow IPv6 address in command line as well in the connection dialog. - The address must be enclosed by square braces, for instance: [::a:b:c:d]. - This is the same syntax used by RealVNC. (LP: #290394) - - Translations (be@latin, ca, de, el, en_GB, es, et, eu, fi, fr, gu, hu, - kn, ko, mk, mr, nb, nl, pa, pl, pt_BR, pt, ro, sv, th, uk, zh_CN, zh_HK, - zh_TW) + * Resync on debian + * debian/control.in: + - depends on liblaunchpad-integration-dev + - don't change binary from arch all to any where not required + - set vcs url + * debian/patches/01_lpi.patch, + debian/patches/99_autoreconf.patch: + - launchpad integration change + * debian/watch: + - watch 2.29 serie + + [ Robert Ancell ] + * New upstream release: (LP: #475012) + - Added a listener mode (similar to vncviewer -listen) + - Added ability to request an screen update + - Added ability to change depth color + - Added ability to use JPEG compression (lossy encoding) + - Added an toolbar in bookmarks panel (LP: #473442) + - Use AM_SILENT_RULES if available + - Requires gtk-vnc 0.3.10 + - Fix warnings and crashes activating bookmarks + - Keep the aspect ratio when using scaling mode + * debian/control.in: + - Bump build-depends on gtk-vnc-1.0-dev + - Bump Standards-Version to 3.8.3 + * debian/patches/01_lpi.patch: + * debian/patches/99_autoreconf.patch: + - Updated - -- Didier Roche Mon, 02 Mar 2009 22:24:34 +0100 + -- Sebastien Bacher Thu, 05 Nov 2009 11:59:53 +0100 -vinagre (2.25.91-0ubuntu1) jaunty; urgency=low +vinagre (2.28.1-1) unstable; urgency=low - * New upstream release (LP: #330229) - - Translations (ast, bg, da, de, es, eu, fr, hu, or, pl, pt_BR, pt - ro, sv, vi, zh-HK, zh_TW) - * Add Vcs-Bzr tag in debian/control - * Re-generate debian/control.in + * New upstream release. + + -- Emilio Pozuelo Monfort Thu, 22 Oct 2009 20:43:41 +0200 - -- Didier Roche Mon, 16 Feb 2009 20:48:17 +0100 +vinagre (2.28.0.1-1) unstable; urgency=low -vinagre (2.25.90-0ubuntu1) jaunty; urgency=low + [ Emilio Pozuelo Monfort ] + * Point Vcs-* to the unstable branch. + * Update my email address. + [ Andrea Veri ] * New upstream release. - - Fix the applet icon on transparent panels (LP: #317559) - - Handle correctly --enable-avahi option in configure.ac - - Updated translations + * debian/control.in: + - Bumped Standards-version to latest 3.8.3. No changes + needed. + - added myself into uploaders field. + - added vinagre-dev new binary file, it will contain all development + files for producing Vinagre plugins. + - bumped libgtk-vnc-1.0-dev to >= 0.3.9 as per configure.ac + requirements. + - added libxml2-dev >= 2.6.31 as per configure.ac requirements. + - added libtelepathy-glib-dev >= 0.7.31, as per configure.ac + requirements. + - added libvte-dev >= 0.20 as per configure.ac requirements. + - removed libglade2-dev B-D, it's no more needed. + - added a depends on vinagre for the vinagre-dev package. + - updated both short and long descriptions to let users know that + vinagre now supports multiple protocols. (not just VNC) + * debian/copyright: + - added missing copyright holders that were missing. + * debian/vinagre-dev.install: + - added to have vinagre-dev binary files installed correctly. + * debian/vinagre.install: + - added to have vinagre binary files installed correctly. - -- Jorge O. Castro Fri, 06 Feb 2009 13:59:16 +0100 + [ Emilio Pozuelo Monfort ] + * Unduplicate vinagre and vinagre-dev synopses. + * Improve long descriptions to mention all the supported protocols. + * Switch vinagre-dev to arch:any to avoid instalability issues. + * Tighten vinagre-dev dependency on vinagre. + * Let vinagre-dev depend on libgtk2.0-dev and libxml2-dev as required by + the pkg-config file. + * Build with --enable-ssh and --enable-telepathy to make sure they're not + accidentally disabled. -vinagre (2.25.5-0ubuntu1) jaunty; urgency=low + -- Emilio Pozuelo Monfort Wed, 23 Sep 2009 17:37:55 +0200 - * New upstream release. - * Remove INSTALL and COPYING in binary-install. +vinagre (2.26.2-1) unstable; urgency=low - -- Emilio Pozuelo Monfort Wed, 28 Jan 2009 11:34:14 +0100 + [ Josselin Mouette ] + * Build-depend on docbook-xml. Closes: #518461. -vinagre (2.25.4-0ubuntu1) jaunty; urgency=low + [ Emilio Pozuelo Monfort ] + * New upstream release. + * Require libgtk-vnc-1.0-dev 0.3.8. + * debian/copyright: updated. + * Standards-Version is 3.8.1, no changes needed. + * debian/menu: added. - * New upstream version (lp: #314822) - * debian/control.in: - - update minimum version of libgtk-vnc-1.0-dev to 0.3.8 for Build-Depends + [ Josselin Mouette ] + * New upstream release. - -- Baptiste Mille-Mathias Wed, 07 Jan 2009 20:25:10 +0100 + -- Josselin Mouette Mon, 01 Jun 2009 11:12:43 +0200 -vinagre (2.24.2-1ubuntu1) jaunty; urgency=low +vinagre (2.24.2-2) unstable; urgency=low - * Merge from Debian unstable, remaining changes: - - Launchpad integration. - * The new upstream release fixes a security exploit (lp: #305623). + * debian/watch: only track stable releases. + * debian/rules: Restore accidentally removed code that removes useless + files. + * Upload to unstable + - debian/rules: remove check-dist include. - -- Emilio Pozuelo Monfort Sat, 06 Dec 2008 23:21:11 +0100 + -- Emilio Pozuelo Monfort Wed, 04 Mar 2009 23:37:34 +0100 vinagre (2.24.2-1) experimental; urgency=high @@ -77,48 +127,6 @@ -- Emilio Pozuelo Monfort Fri, 05 Dec 2008 23:39:31 +0100 -vinagre (2.24.1-0ubuntu1) intrepid; urgency=low - - * New upstream release (LP: #286620) - - create the parent directory before copying the old bookmarks file - to the new location (LP: #275460) - - updated translations: ar, be@latin, el - - -- Didier Roche Mon, 20 Oct 2008 22:43:32 +0200 - -vinagre (2.24.0-0ubuntu1) intrepid; urgency=low - - * New upstream release with updated translations (lp: #273270) - - -- Emilio Pozuelo Monfort Mon, 22 Sep 2008 20:59:39 +0200 - -vinagre (2.23.92-0ubuntu1) intrepid; urgency=low - - * New upstream release (lp: #268484): - - Support down scaling, requires gtk-vnc 0.3.7 - + Bump gtk-vnc build-dependency to 0.3.7 - - Updated translations. - - -- Emilio Pozuelo Monfort Wed, 10 Sep 2008 11:45:28 +0200 - -vinagre (2.23.90-0ubuntu1) intrepid; urgency=low - - * New upstream release (LP: #260550) - - Minor bugfixes - * debian/control.in: - - Bump up b-d on libglib2.0-dev to 2.17.0 and - libgtk2.0-dev to 2.13.1 - - B-d on liblaunchpad-integration-dev - - Modify Maintainer to Desktop Team - * debian/rules: - - Added cdbs simple-patchsys.mk - * debian/patches/01_lpi.patch: - - Add Launchpad-integration to Vinagre - * debian/patches/02_autoconf.patch: - - Added to apply the changes - - -- Pedro Fragoso Fri, 22 Aug 2008 23:54:52 +0100 - vinagre (2.23.4-1) experimental; urgency=low * New upstream releases: diff -Nru vinagre-2.26.1/debian/control vinagre-2.29.1/debian/control --- vinagre-2.26.1/debian/control 2009-12-18 09:12:10.000000000 +0000 +++ vinagre-2.29.1/debian/control 2009-12-18 09:12:11.000000000 +0000 @@ -1,9 +1,9 @@ Source: vinagre Section: gnome Priority: optional -Maintainer: Emilio Pozuelo Monfort -Uploaders: Debian GNOME Maintainers -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/vinagre/ubuntu +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Emilio Pozuelo Monfort +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Andrea Veri Build-Depends: cdbs (>= 0.4.52), debhelper (>= 5.0.51~), gnome-doc-utils (>= 0.3.2), @@ -11,32 +11,53 @@ intltool (>= 0.35.0), libglib2.0-dev (>= 2.17.0), libgtk2.0-dev (>= 2.13.1), - libglade2-dev (>= 1:2.6.0), libgconf2-dev (>= 2.16.0), libgnome-keyring-dev, - libgtk-vnc-1.0-dev (>= 0.3.8), + libgtk-vnc-1.0-dev (>= 0.3.10), libavahi-ui-dev (>= 0.6.22), libavahi-gobject-dev (>= 0.6.22), libpanel-applet2-dev (>= 2.0), - liblaunchpad-integration-dev, - gconf2 -Standards-Version: 3.8.0 + libvte-dev (>= 0.20), + libxml2-dev (>= 2.6.31), + libtelepathy-glib-dev (>= 0.7.31), + gconf2, + docbook-xml, + liblaunchpad-integration-dev +Standards-Version: 3.8.3 Homepage: http://www.gnome.org/projects/vinagre/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/vinagre -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/vinagre +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/vinagre +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/vinagre +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/vinagre/ubuntu Package: vinagre Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: VNC client for the GNOME Desktop - Vinagre is a VNC client integrated into the GNOME Desktop. +Description: remote desktop client for the GNOME Desktop + Vinagre is a remote desktop client integrated into the GNOME Desktop. . With Vinagre you can have several connections open simultaneously, bookmark your servers thanks to the Favorites support, store the passwords in the GNOME keyring, and browse the network to look for VNC servers. . - A Virtual Network Computing (VNC) server is a computer sharing its - screen to the network, so anyone with enough permissions can control - it remotely. + Supported protocols are VNC and SSH. + +Package: vinagre-dev +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + vinagre (= ${binary:Version}), + libgtk2.0-dev (>= 2.13.1), + libxml2-dev (>= 2.6.31) +Description: remote desktop client for the GNOME Desktop (devel) + Vinagre is a remote desktop client integrated into the GNOME Desktop. + . + With Vinagre you can have several connections open simultaneously, + bookmark your servers thanks to the Favorites support, store the + passwords in the GNOME keyring, and browse the network to look for + VNC servers. + . + Supported protocols are VNC and SSH. + . + This package contains the development files. diff -Nru vinagre-2.26.1/debian/control.in vinagre-2.29.1/debian/control.in --- vinagre-2.26.1/debian/control.in 2009-12-18 09:12:10.000000000 +0000 +++ vinagre-2.29.1/debian/control.in 2009-12-18 09:12:11.000000000 +0000 @@ -1,9 +1,9 @@ Source: vinagre Section: gnome Priority: optional -Maintainer: Emilio Pozuelo Monfort -Uploaders: @GNOME_TEAM@ -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/vinagre/ubuntu +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Emilio Pozuelo Monfort +Uploaders: @GNOME_TEAM@, Andrea Veri Build-Depends: cdbs (>= 0.4.52), debhelper (>= 5.0.51~), gnome-doc-utils (>= 0.3.2), @@ -11,32 +11,53 @@ intltool (>= 0.35.0), libglib2.0-dev (>= 2.17.0), libgtk2.0-dev (>= 2.13.1), - libglade2-dev (>= 1:2.6.0), libgconf2-dev (>= 2.16.0), libgnome-keyring-dev, - libgtk-vnc-1.0-dev (>= 0.3.8), + libgtk-vnc-1.0-dev (>= 0.3.10), libavahi-ui-dev (>= 0.6.22), libavahi-gobject-dev (>= 0.6.22), libpanel-applet2-dev (>= 2.0), - liblaunchpad-integration-dev, - gconf2 -Standards-Version: 3.8.0 + libvte-dev (>= 0.20), + libxml2-dev (>= 2.6.31), + libtelepathy-glib-dev (>= 0.7.31), + gconf2, + docbook-xml, + liblaunchpad-integration-dev +Standards-Version: 3.8.3 Homepage: http://www.gnome.org/projects/vinagre/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/vinagre -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/vinagre +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/vinagre +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/vinagre +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/vinagre/ubuntu Package: vinagre Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: VNC client for the GNOME Desktop - Vinagre is a VNC client integrated into the GNOME Desktop. +Description: remote desktop client for the GNOME Desktop + Vinagre is a remote desktop client integrated into the GNOME Desktop. . With Vinagre you can have several connections open simultaneously, bookmark your servers thanks to the Favorites support, store the passwords in the GNOME keyring, and browse the network to look for VNC servers. . - A Virtual Network Computing (VNC) server is a computer sharing its - screen to the network, so anyone with enough permissions can control - it remotely. + Supported protocols are VNC and SSH. + +Package: vinagre-dev +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + vinagre (= ${binary:Version}), + libgtk2.0-dev (>= 2.13.1), + libxml2-dev (>= 2.6.31) +Description: remote desktop client for the GNOME Desktop (devel) + Vinagre is a remote desktop client integrated into the GNOME Desktop. + . + With Vinagre you can have several connections open simultaneously, + bookmark your servers thanks to the Favorites support, store the + passwords in the GNOME keyring, and browse the network to look for + VNC servers. + . + Supported protocols are VNC and SSH. + . + This package contains the development files. diff -Nru vinagre-2.26.1/debian/copyright vinagre-2.29.1/debian/copyright --- vinagre-2.26.1/debian/copyright 2009-12-18 09:12:10.000000000 +0000 +++ vinagre-2.29.1/debian/copyright 2009-12-18 09:12:11.000000000 +0000 @@ -7,10 +7,23 @@ Copyright: -Copyright (C) 2007, 2008 - Jonh Wendell -Copyright (C) 2006 Kristian Rietveld +Copyright (C) 2007-2009 Jonh Wendell Copyright (C) 2003 - Bastien Nocera -Copyright (C) 1999, 2000, 2000 Red Hat Inc. +Copyright (C) 1999, 2000 Red Hat Inc. +Copyright (C) 2008 Jesse van den Kieboom +Copyright (C) 2009 Jorge Pereira +Copyright (C) 2000, 2001 Chema Celorio +Copyright (C) 2001, 2007 Paolo Maggi +Copyright (C) 1998, 1999 Alex Roberts +Copyright (C) 1998, 1999 Evan Lawrence +Copyright (C) 2009 Collabora Ltd +Copyright (C) 2000 Eazel, Inc +Copyright (C) 2003 Bastien Nocera +Copyright (C) 2002, 2004 Marco Pesenti Gritti +Copyright (C) 2007 Steve Frécinaux + +Files in po/ are Copyright their respective translators unless specified +otherwise, and are licensed under the same terms as Vinagre, see below. License: @@ -28,6 +41,22 @@ along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + + vinagre 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 3 of the License, or + (at your option) any later version. + + vinagre 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. + + You should have received a copy of the GNU General Public License along + with this program. If not, see . + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -57,5 +86,6 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - +Public License can be found in `/usr/share/common-licenses/GPL-2' for the +version 2 of the License, and `/usr/share/common-licenses/GPL-3' for the +version 3 of the License. diff -Nru vinagre-2.26.1/debian/patches/01_lpi.patch vinagre-2.29.1/debian/patches/01_lpi.patch --- vinagre-2.26.1/debian/patches/01_lpi.patch 2009-12-18 09:12:10.000000000 +0000 +++ vinagre-2.29.1/debian/patches/01_lpi.patch 2009-12-18 09:12:11.000000000 +0000 @@ -1,19 +1,19 @@ # UbuntuSpec: Launchpad-integration # Pedro Fragoso = $GLIB_REQUIRED \ gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ gconf-2.0 >= $GCONF_REQUIRED \ + launchpad-integration \ gthread-2.0 >= $GTHREAD_REQUIRED \ gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED \ -diff -Nur -x '*.orig' -x '*~' vinagre-2.23.90/data/vinagre-ui.xml vinagre-2.23.90.new/data/vinagre-ui.xml ---- vinagre-2.23.90/data/vinagre-ui.xml 2008-05-28 19:16:54.000000000 +0100 -+++ vinagre-2.23.90.new/data/vinagre-ui.xml 2008-08-23 00:06:39.000000000 +0100 + libxml-2.0 >= $XML_REQUIRED +diff -Nur -x '*.orig' -x '*~' vinagre-2.29.1/data/vinagre-ui.xml vinagre-2.29.1.new/data/vinagre-ui.xml +--- vinagre-2.29.1/data/vinagre-ui.xml 2009-10-26 22:47:40.000000000 +1100 ++++ vinagre-2.29.1.new/data/vinagre-ui.xml 2009-11-05 14:01:39.000000000 +1100 @@ -59,6 +59,7 @@ @@ -22,9 +22,9 @@ -diff -Nur -x '*.orig' -x '*~' vinagre-2.23.90/src/vinagre-window.c vinagre-2.23.90.new/src/vinagre-window.c ---- vinagre-2.23.90/src/vinagre-window.c 2008-07-26 13:09:45.000000000 +0100 -+++ vinagre-2.23.90.new/src/vinagre-window.c 2008-08-23 00:04:05.000000000 +0100 +diff -Nur -x '*.orig' -x '*~' vinagre-2.29.1/vinagre/vinagre-window.c vinagre-2.29.1.new/vinagre/vinagre-window.c +--- vinagre-2.29.1/vinagre/vinagre-window.c 2009-10-26 22:58:07.000000000 +1100 ++++ vinagre-2.29.1.new/vinagre/vinagre-window.c 2009-11-05 14:01:39.000000000 +1100 @@ -29,6 +29,8 @@ #include #include @@ -34,7 +34,7 @@ #include "vinagre-window.h" #include "vinagre-notebook.h" #include "vinagre-fav.h" -@@ -437,6 +439,8 @@ +@@ -414,6 +416,8 @@ FALSE, 0); diff -Nru vinagre-2.26.1/debian/patches/02_autoconf.patch vinagre-2.29.1/debian/patches/02_autoconf.patch --- vinagre-2.26.1/debian/patches/02_autoconf.patch 2009-12-18 09:12:10.000000000 +0000 +++ vinagre-2.29.1/debian/patches/02_autoconf.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -diff -Nur -x '*.orig' -x '*~' vinagre-2.26.0/configure vinagre-2.26.0.new/configure ---- vinagre-2.26.0/configure 2009-03-04 18:47:42.000000000 +0100 -+++ vinagre-2.26.0.new/configure 2009-03-17 07:18:31.000000000 +0100 -@@ -15363,6 +15363,7 @@ - gtk+-2.0 >= \$GTK_REQUIRED \\ - libglade-2.0 >= \$LIBGLADE_REQUIRED \\ - gconf-2.0 >= \$GCONF_REQUIRED \\ -+ launchpad-integration \\ - gthread-2.0 >= \$GTHREAD_REQUIRED \\ - gnome-keyring-1 \\ - gtk-vnc-1.0 >= \$GTK_VNC_REQUIRED\"") >&5 -@@ -15372,6 +15373,7 @@ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ -+ launchpad-integration \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED") 2>&5 -@@ -15384,6 +15386,7 @@ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ -+ launchpad-integration \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED" 2>/dev/null` -@@ -15405,6 +15408,7 @@ - gtk+-2.0 >= \$GTK_REQUIRED \\ - libglade-2.0 >= \$LIBGLADE_REQUIRED \\ - gconf-2.0 >= \$GCONF_REQUIRED \\ -+ launchpad-integration \\ - gthread-2.0 >= \$GTHREAD_REQUIRED \\ - gnome-keyring-1 \\ - gtk-vnc-1.0 >= \$GTK_VNC_REQUIRED\"") >&5 -@@ -15414,6 +15418,7 @@ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ -+ launchpad-integration \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED") 2>&5 -@@ -15426,6 +15431,7 @@ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ -+ launchpad-integration \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED" 2>/dev/null` -@@ -15453,6 +15459,7 @@ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ -+ launchpad-integration \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED"` -@@ -15463,6 +15470,7 @@ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ -+ launchpad-integration \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED"` -@@ -15476,6 +15484,7 @@ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ -+ launchpad-integration \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED) were not met: -@@ -15495,6 +15504,7 @@ - gtk+-2.0 >= $GTK_REQUIRED \ - libglade-2.0 >= $LIBGLADE_REQUIRED \ - gconf-2.0 >= $GCONF_REQUIRED \ -+ launchpad-integration \ - gthread-2.0 >= $GTHREAD_REQUIRED \ - gnome-keyring-1 \ - gtk-vnc-1.0 >= $GTK_VNC_REQUIRED) were not met: diff -Nru vinagre-2.26.1/debian/patches/99_autoreconf.patch vinagre-2.29.1/debian/patches/99_autoreconf.patch --- vinagre-2.26.1/debian/patches/99_autoreconf.patch 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/debian/patches/99_autoreconf.patch 2009-12-18 09:12:11.000000000 +0000 @@ -0,0 +1,123 @@ +diff -Nur -x '*.orig' -x '*~' vinagre-2.29.1/configure vinagre-2.29.1.new/configure +--- vinagre-2.29.1/configure 2009-10-26 23:12:36.000000000 +1100 ++++ vinagre-2.29.1.new/configure 2009-11-05 14:03:16.000000000 +1100 +@@ -13863,6 +13863,7 @@ + gio-2.0 >= \$GLIB_REQUIRED \\ + gtk+-2.0 >= \$GTK_REQUIRED \\ + gconf-2.0 >= \$GCONF_REQUIRED \\ ++ launchpad-integration \\ + gthread-2.0 >= \$GTHREAD_REQUIRED \\ + gnome-keyring-1 \\ + libxml-2.0 >= \$XML_REQUIRED +@@ -13872,6 +13873,7 @@ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ ++ launchpad-integration \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +@@ -13884,6 +13886,7 @@ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ ++ launchpad-integration \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +@@ -13905,6 +13908,7 @@ + gio-2.0 >= \$GLIB_REQUIRED \\ + gtk+-2.0 >= \$GTK_REQUIRED \\ + gconf-2.0 >= \$GCONF_REQUIRED \\ ++ launchpad-integration \\ + gthread-2.0 >= \$GTHREAD_REQUIRED \\ + gnome-keyring-1 \\ + libxml-2.0 >= \$XML_REQUIRED +@@ -13914,6 +13918,7 @@ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ ++ launchpad-integration \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +@@ -13926,6 +13931,7 @@ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ ++ launchpad-integration \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +@@ -13953,6 +13959,7 @@ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ ++ launchpad-integration \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +@@ -13963,6 +13970,7 @@ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ ++ launchpad-integration \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +@@ -13976,6 +13984,7 @@ + gio-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ ++ launchpad-integration \ + gthread-2.0 >= $GTHREAD_REQUIRED \ + gnome-keyring-1 \ + libxml-2.0 >= $XML_REQUIRED +diff -Nur -x '*.orig' -x '*~' vinagre-2.29.1/INSTALL vinagre-2.29.1.new/INSTALL +--- vinagre-2.29.1/INSTALL 2009-10-22 22:56:47.000000000 +1100 ++++ vinagre-2.29.1.new/INSTALL 2009-11-05 14:03:19.000000000 +1100 +@@ -2,7 +2,7 @@ + ************************* + + Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +-2006, 2007, 2008 Free Software Foundation, Inc. ++2006, 2007, 2008, 2009 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives + unlimited permission to copy, distribute and modify it. +@@ -159,7 +159,7 @@ + CC is not installed, it is recommended to use the following options in + order to use an ANSI C compiler: + +- ./configure CC="cc -Ae" ++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + + and if that doesn't work, install pre-built binaries of GCC for HP-UX. + +@@ -174,6 +174,16 @@ + + ./configure CC="cc -nodtk" + ++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This ++directory contains several dysfunctional programs; working variants of ++these programs are available in `/usr/bin'. So, if you need `/usr/ucb' ++in your `PATH', put it _after_ `/usr/bin'. ++ ++ On Haiku, software installed for all users goes in `/boot/common', ++not `/usr/local'. It is recommended to use the following options: ++ ++ ./configure --prefix=/boot/common ++ + Specifying the System Type + ========================== + +@@ -189,7 +199,8 @@ + + where SYSTEM can have one of these forms: + +- OS KERNEL-OS ++ OS ++ KERNEL-OS + + See the file `config.sub' for the possible values of each field. If + `config.sub' isn't included in this package, then this package doesn't diff -Nru vinagre-2.26.1/debian/rules vinagre-2.29.1/debian/rules --- vinagre-2.26.1/debian/rules 2009-12-18 09:12:10.000000000 +0000 +++ vinagre-2.29.1/debian/rules 2009-12-18 09:12:11.000000000 +0000 @@ -2,15 +2,16 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk LDFLAGS += -Wl,-O1 -Wl,--as-needed DEB_CONFIGURE_EXTRA_FLAGS += --enable-avahi \ + --enable-ssh \ + --enable-telepathy \ --disable-scrollkeeper binary-install/vinagre:: diff -Nru vinagre-2.26.1/debian/vinagre-dev.install vinagre-2.29.1/debian/vinagre-dev.install --- vinagre-2.26.1/debian/vinagre-dev.install 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/debian/vinagre-dev.install 2009-12-18 09:12:11.000000000 +0000 @@ -0,0 +1,2 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig diff -Nru vinagre-2.26.1/debian/vinagre.install vinagre-2.29.1/debian/vinagre.install --- vinagre-2.26.1/debian/vinagre.install 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/debian/vinagre.install 2009-12-18 09:12:11.000000000 +0000 @@ -0,0 +1,8 @@ +debian/tmp/usr/bin +debian/tmp/usr/lib/vinagre +debian/tmp/usr/lib/vinagre-1/plugins/*.vinagre-plugin +debian/tmp/usr/lib/vinagre-1/plugins/*.so +debian/tmp/usr/lib/vinagre-1/plugin-loaders/*.so +debian/tmp/usr/lib/bonobo +debian/tmp/usr/share +debian/tmp/etc diff -Nru vinagre-2.26.1/debian/watch vinagre-2.29.1/debian/watch --- vinagre-2.26.1/debian/watch 2009-12-18 09:12:10.000000000 +0000 +++ vinagre-2.29.1/debian/watch 2009-12-18 09:12:11.000000000 +0000 @@ -1,2 +1,3 @@ version=2 -http://ftp.gnome.org/pub/GNOME/sources/vinagre/([\d\.]+)/vinagre-([\d\.]+)\.tar\.gz +http://ftp.gnome.org/pub/GNOME/sources/vinagre/([\d\.]+)[024689]/ \ +vinagre-([\d\.]+)\.tar\.gz diff -Nru vinagre-2.26.1/depcomp vinagre-2.29.1/depcomp --- vinagre-2.26.1/depcomp 2009-04-13 14:35:37.000000000 +0100 +++ vinagre-2.29.1/depcomp 2009-10-26 13:35:26.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2007-03-29.01 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,6 +85,15 @@ depmode=dashmstdout fi +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u="sed s,\\\\\\\\,/,g" + depmode=msvisualcpp +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -192,14 +199,14 @@ ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> $depfile - echo >> $depfile +' ' ' >> "$depfile" + echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -328,7 +335,12 @@ if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -404,7 +416,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -455,32 +467,39 @@ "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -500,7 +519,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -538,13 +557,27 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -557,16 +590,23 @@ ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + none) exec "$@" ;; @@ -585,5 +625,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru vinagre-2.26.1/gnome-doc-utils.make vinagre-2.29.1/gnome-doc-utils.make --- vinagre-2.26.1/gnome-doc-utils.make 2009-04-13 14:35:26.000000000 +0100 +++ vinagre-2.29.1/gnome-doc-utils.make 2009-10-26 13:35:19.000000000 +0000 @@ -92,6 +92,14 @@ ## The name of the document being built DOC_MODULE ?= +## @ DOC_ID +## The unique identifier for a Mallard document +DOC_ID ?= + +## @ DOC_PAGES +## Page files in a Mallard document +DOC_PAGES ?= + ## @ DOC_ENTITIES ## Files included with a SYSTEM entity DOC_ENTITIES ?= @@ -123,9 +131,11 @@ ## Variables for Bootstrapping _xml2po ?= `which xml2po` +_xml2po_mode = $(if $(DOC_ID),mallard,docbook) _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` +_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl @@ -205,6 +215,10 @@ ## The top-level documentation file in the C locale _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) +## @ _DOC_C_PAGES +## Page files in a Mallard document in the C locale +_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page)) + ## @ _DOC_C_ENTITIES ## Files included with a SYSTEM entity in the C locale _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) @@ -217,13 +231,14 @@ ## All documentation files in the C locale _DOC_C_DOCS = \ $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ - $(_DOC_C_MODULE) + $(_DOC_C_PAGES) $(_DOC_C_MODULE) ## @ _DOC_C_DOCS_NOENT ## All documentation files in the C locale, ## except files included with a SYSTEM entity _DOC_C_DOCS_NOENT = \ - $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) + $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \ + $(_DOC_C_PAGES) ## @ _DOC_C_FIGURES ## All figures and other external data in the C locale @@ -245,7 +260,7 @@ ## @ _DOC_POFILES ## The .po files used for translating the document -_DOC_POFILES = $(if $(DOC_MODULE), \ +_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) .PHONY: po @@ -256,6 +271,12 @@ _DOC_LC_MODULES = $(if $(DOC_MODULE), \ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) +## @ _DOC_LC_PAGES +## Page files in a Mallard document in all other locales +_DOC_LC_PAGES = \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \ + $(lc)/$(notdir $(page)) )) + ## @ _DOC_LC_XINCLUDES ## Files included with XInclude in all other locales _DOC_LC_INCLUDES = \ @@ -272,7 +293,7 @@ ## @ _DOC_LC_DOCS ## All documentation files in all other locales _DOC_LC_DOCS = \ - $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \ + $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) ## @ _DOC_LC_FIGURES @@ -299,16 +320,16 @@ done; \ if ! test -f $@; then \ echo "(cd $(dir $@) && \ - $(_xml2po) -e $$docs > $(notdir $@).tmp && \ + $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ (cd $(dir $@) && \ - $(_xml2po) -e $$docs > $(notdir $@).tmp && \ + $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ else \ echo "(cd $(dir $@) && \ - $(_xml2po) -e -u $(notdir $@) $$docs)"; \ + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \ (cd $(dir $@) && \ - $(_xml2po) -e -u $(notdir $@) $$docs); \ + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ fi # FIXME: fix the dependancy @@ -317,9 +338,10 @@ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) if ! test -d $(dir $@); then mkdir $(dir $@); fi if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \ + if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \ (cd $(dir $@) && \ - $(_xml2po) -e -p \ - "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \ + $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) @@ -329,7 +351,7 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -e -o $@ $^ + $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ ################################################################################ @@ -347,6 +369,7 @@ ################################################################################ +## All all: \ $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ @@ -354,6 +377,9 @@ $(_DOC_HTML_ALL) $(_DOC_POFILES) +################################################################################ +## Clean + .PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) @@ -372,7 +398,7 @@ rm -f "$$lc/.xml2po.mo"; \ fi; \ done -clean-doc-dir: +clean-doc-dir: clean-doc-lc @for lc in C $(_DOC_REAL_LINGUAS); do \ for dir in `find $$lc -depth -type d`; do \ if ! test $$dir -ef $(srcdir)/$$dir; then \ @@ -385,7 +411,7 @@ _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) -_clean_dir = $(if $(DOC_MODULE),clean-doc-dir) +_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir) clean-local: \ $(_clean_omf) $(_clean_dsk) \ @@ -401,10 +427,14 @@ $(_clean_lc) $(_clean_dir) -.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk -doc-dist-hook: \ - $(if $(DOC_MODULE),dist-doc-docs) \ - $(if $(_DOC_C_FIGURES),dist-doc-figs) \ + +################################################################################ +## Dist + +.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk +doc-dist-hook: \ + $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \ + $(if $(_DOC_C_FIGURES),dist-doc-figs) \ $(if $(_DOC_OMF_IN),dist-doc-omf) # $(if $(_DOC_DSK_IN),dist-doc-dsk) @@ -451,9 +481,14 @@ $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" + +################################################################################ +## Check + .PHONY: check-doc-docs check-doc-omf check: \ $(if $(DOC_MODULE),check-doc-docs) \ + $(if $(DOC_ID),check-doc-pages) \ $(if $(_DOC_OMF_IN),check-doc-omf) check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) @@ -469,6 +504,21 @@ xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ done +check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES) + for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(DOC_PAGES); do \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + done; \ + done + check-doc-omf: $(_DOC_OMF_ALL) @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ @@ -476,9 +526,16 @@ done + +################################################################################ +## Install + .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk + +_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE)) + install-data-local: \ - $(if $(DOC_MODULE),install-doc-docs) \ + $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \ $(if $(_DOC_HTML_ALL),install-doc-html) \ $(if $(_DOC_C_FIGURES),install-doc-figs) \ $(if $(_DOC_OMF_IN),install-doc-omf) @@ -486,42 +543,46 @@ install-doc-docs: @for lc in C $(_DOC_REAL_LINGUAS); do \ - echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ - $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \ + echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ + $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ if ! test -d "$$docdir"; then \ echo "$(mkinstalldirs) $$docdir"; \ $(mkinstalldirs) "$$docdir"; \ fi; \ - echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ - $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ done install-doc-figs: @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ for lc in C $(_DOC_REAL_LINGUAS); do \ + figsymlink=false; \ if test -f "$$lc/$$fig"; then \ figfile="$$lc/$$fig"; \ elif test -f "$(srcdir)/$$lc/$$fig"; then \ figfile="$(srcdir)/$$lc/$$fig"; \ - elif test -f "C/$$fig"; then \ - figfile="C/$$fig"; \ else \ - figfile="$(srcdir)/C/$$fig"; \ + figsymlink=true; \ fi; \ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ + figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \ if ! test -d "$$figdir"; then \ echo "$(mkinstalldirs) $$figdir"; \ $(mkinstalldirs) "$$figdir"; \ fi; \ figbase=`echo $$fig | sed -e 's/^.*\///'`; \ - echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ - $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + if $$figsymlink; then \ + echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ + ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ + else \ + echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ + $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + fi; \ done; \ done @@ -529,23 +590,27 @@ echo install-html install-doc-omf: - $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE) + $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir) @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ - echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \ + echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \ done @if test "x$(_ENABLE_SK)" = "xtrue"; then \ - echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ - scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ + echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ + scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ fi; install-doc-dsk: echo install-dsk + +################################################################################ +## Uninstall + .PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk uninstall-local: \ - $(if $(DOC_MODULE),uninstall-doc-docs) \ + $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \ $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ $(if $(_DOC_OMF_IN),uninstall-doc-omf) @@ -553,22 +618,22 @@ uninstall-doc-docs: @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ - echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ - rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done uninstall-doc-figs: @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ - echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ - rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ + echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ done; uninstall-doc-omf: @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ if test "x$(_ENABLE_SK)" = "xtrue"; then \ - echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ fi; \ - echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ done Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/C/figures/vinagre-auth-needed.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/C/figures/vinagre-auth-needed.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/C/figures/vinagre-bookmarks-side-panel.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/C/figures/vinagre-bookmarks-side-panel.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/C/figures/vinagre-connect-dialog.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/C/figures/vinagre-connect-dialog.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/C/figures/vinagre-editing-bookmarks.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/C/figures/vinagre-editing-bookmarks.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/C/figures/vinagre-saving-bookmarks.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/C/figures/vinagre-saving-bookmarks.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/C/figures/vinagre-screenshot.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/C/figures/vinagre-screenshot.png differ diff -Nru vinagre-2.26.1/help/C/vinagre.xml vinagre-2.29.1/help/C/vinagre.xml --- vinagre-2.26.1/help/C/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/C/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -5,8 +5,8 @@ &app;"> - - + + ]> @@ -129,7 +144,7 @@ vinagre - The &app; application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system to remotely control another computer. + The &app; application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. &app; provides the following features: @@ -139,7 +154,13 @@ Store recently connections and allows to bookmark them. - Browse local network for VNC Servers. + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -151,7 +172,7 @@ -
+
Starting &app; You can start &app; in the following ways: @@ -169,8 +190,19 @@
- -
+ + +
+ Starting &app; from a command line + You can run &app; from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run &app; from a command line, see the unix manual page for &app;, &app;1. +
+ + + + +
The &app; Window
&app; window @@ -216,40 +248,92 @@ Side Pane - The side pane contains a list of bookmarked connections. + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about &app; + As a tool to access other machines, &app; behaves slightly different than other GNOME applications in its default installation. + &app; comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by &app; when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to &app; preferences in + + Edit + Preferences + . + + +
+
Using &app;
- To connect with a remote machine + To connect to a remote machine
- Informing Host address + Informing a host address To connect with a remote machine, choose CtrlN Machine Connect . The Connection Dialog is displayed. - Inform the Host and the Port of - the connection and click the Connect button. You can - also use the Find button to browse available machines on local network. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. - Some machines may require a secure connection. In this case, a - Password dialog will be displayed asking for the connection password. - If you check Remember this password, &app; will store - the secure information using GNOME Keyring Manager. + The availabity of the Find button depends on the protocol you + have selected. &app; relies on Avahi service to browse for + machines in your local network. Also, notice that &app; can be compiled without + Avahi support. In this case, this button will not be available. + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, &app; will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ If the connection has been used previously, you can also access it by @@ -278,46 +362,32 @@
+ +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
-
- To Create a New Bookmark - To bookmark the currently viewed connection, choose +
+ To Use Full Screen Mode + To zoom the Display Area to full screen mode, choose - CtrlD - Bookmarks - Add to Bookmarks - . The Saving to Bookmarks dialog is displayed. - Inform the name of the connection and click Ok. - -
- -
- To Remove a Bookmark - - To remove a bookmark, choose Remove from the context menu - of the bookmark in the Side Pane. - -
- -
- To Edit a Bookmark's Properties - - To edit a bookmark's properties, such as it's name and host, choose Edit - from the context menu of the bookmark in the Side Pane. + F11 + View + Full Screen + or the corresponding tool bar button. -
- -
- To Use Full Screen Mode - To zoom the Display Area to full screen mode, choose - - F11 - View - Full Screen - . To exit full screen mode, press F11 - or CtrlAlt. - + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -345,13 +415,136 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ To Create a New Bookmark + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ To Edit a Bookmark's Properties + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ To Remove a Bookmark + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure &app;, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that &app; will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
About &app; was written by Jonh Wendell wendell@bani.com.br. To find more information about &app;, please visit the - - &application; web page. + &application; web page. To report a bug or make a suggestion regarding this application you can file diff -Nru vinagre-2.26.1/help/ca/vinagre.xml vinagre-2.29.1/help/ca/vinagre.xml --- vinagre-2.26.1/help/ca/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/ca/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +151,7 @@ vinagre - L'aplicació Vinagre és un visualitzador d'escriptoris remots per a l'escriptori GNOME que utilitza el sistema de Computació en Xarxa Virtual (VNC) per a controlar remotament un altre ordinador. + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. El Vinagre proporciona les funcionalitats següents: @@ -142,7 +161,13 @@ Emmagatzema les connexions recents i permet desar-les com a adreces d'interès. - Cerca servidors VNC en la xarxa local. + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -154,7 +179,7 @@ -
+
Iniciar el Vinagre Podeu iniciar el Vinagre de les maneres següents: @@ -172,8 +197,19 @@
- -
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
La finestra del Vinagre
Finestra del Vinagre @@ -218,26 +254,92 @@ Quadre lateral - El quadre lateral conté una llista amb les adreces d'interès. + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+
Utilitzar el Vinagre
- Per a connectar-se a un ordinador remot + To connect to a remote machine
- Introduïr l'adreça de l'amfitrió - Per a connectar-se amb un ordinador remot, seleccioneu CtrlNOrdinadorConnecta. Es mostrarà el diàleg de connexió. Introduïu l'Ordinador i el Port de la connexió i feu clic al botó Connecta. També podeu utilitzar el botó Cerca per a cerca els ordinadors disponibles en la xarxa local. + Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + - Alguns ordinadors poden necessitar una connexió segura. En aquest cas, es mostrarà el diàleg Contrasenya demanant la contrasenya de connexió. Si activeu Recorda aquesta contrasenya, el Vinagre emmagatzemarà la informació privada amb el Gestor de l'anell de claus del GNOME. + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ Si ja us havíeu connectat a un ordinador, podeu accedir a la connexió a través de OrdinadorConnexions recents....
@@ -249,26 +351,32 @@ També podeu fer doble clic a un fitxer de connexió remota en el gestor de fitxers Nautilus per a obrir-lo en la finestra del Vinagre.
-
- -
- Per a crear una adreça d'interès nova. - Per a afegir la connexió actual a les adreces d'interès, seleccioneu CtrlDAdreces d'interèsAfegeix a les adreces d'interès. Es mostrarà el diàleg Desant a les adreces d'interès. Introduïu el nom de la connexió i feu clic a D'acord. -
- -
- Per a suprimir una adreça d'interès - Per a suprimir una adreça d'interès, seleccioneu Suprimeix en el menú contextual de les adreces d'interès en el quadre lateral. -
- -
- Per a editar les propietats d'una adreça d'interès - Per a editar les propietats d'una adreça d'interès, com el seu nom i l'ordinador, seleccioneu Edita en el menú contextual de les adreces d'interès en el quadre lateral. + +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
- Per a utilitzar el mode de pantalla completa - Per a passar a mode de pantalla completa, seleccioneu F11VisualitzaPantalla completa. Per a sortir del mode de pantalla completa, premeu F11 o CtrlAlt. + Per a utilitzar el mode de pantalla completa + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -284,9 +392,137 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ Per a crear una adreça d'interès nova. + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ Per a editar les propietats d'una adreça d'interès + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ Per a suprimir una adreça d'interès + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
Quant a - En Jonh Wendell wendell@bani.com.br ha escrit el Vinagre. Per a trobar més informació sobre el Vinagre, visiteu la pàgina web del Vinagre. + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + Per a informar d'un error o fer algun suggeriment sobre aquesta aplicació podeu omplir un informe a la pàgina de seguiment d'errors. Aquest programa es distribueix sota els termes de la Llicència pública general de GNU tal com publica la Free Software Foundation; tant en la versió 2 de la llicència, o (a la vostra opció) una versió posterior. Es pot trobar una copia d'aquesta llicència en el lloc web del GNU, o en el fitxer COPYING inclòs amb el codi font d'aquest programa.
diff -Nru vinagre-2.26.1/help/ChangeLog vinagre-2.29.1/help/ChangeLog --- vinagre-2.26.1/help/ChangeLog 2009-04-04 12:06:51.000000000 +0100 +++ vinagre-2.29.1/help/ChangeLog 2009-04-18 14:25:15.000000000 +0100 @@ -1,3 +1,5 @@ +==================== 2.26.1 ======================= + 2009-04-04 Simos Xenitellis * el/figures/*.png: Added screenshot by Fotis Tsamis. diff -Nru vinagre-2.26.1/help/cs/cs.po vinagre-2.29.1/help/cs/cs.po --- vinagre-2.26.1/help/cs/cs.po 2009-04-13 14:36:21.000000000 +0100 +++ vinagre-2.29.1/help/cs/cs.po 2009-10-26 13:44:11.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: Vinagre\n" -"POT-Creation-Date: 2009-03-12 17:11+0000\n" -"PO-Revision-Date: 2009-03-12 19:53+0100\n" +"POT-Creation-Date: 2009-09-17 16:35+0000\n" +"PO-Revision-Date: 2009-09-18 13:40+0100\n" "Last-Translator: Lucas Lommer \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -14,13 +14,63 @@ #. 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/vinagre.xml:180(None) +#: C/vinagre.xml:212(None) msgid "" "@@image: 'figures/vinagre-screenshot.png'; " -"md5=5ea2ba4ba469dadea877f19b6b33ced2" +"md5=dc88b591b3b8ed3a49335c5431806c13" msgstr "" "@@image: 'figures/vinagre-screenshot.png'; " -"md5=5ea2ba4ba469dadea877f19b6b33ced2" +"md5=dc88b591b3b8ed3a49335c5431806c13" + +#. 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/vinagre.xml:298(None) +msgid "" +"@@image: 'figures/vinagre-connect-dialog.png'; " +"md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" +msgstr "" +"@@image: 'figures/vinagre-connect-dialog.png'; " +"md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" + +#. 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/vinagre.xml:330(None) +msgid "" +"@@image: 'figures/vinagre-auth-needed.png'; " +"md5=3cd74cebc8d1d5e2c23b4419e28f6c11" +msgstr "" +"@@image: 'figures/vinagre-auth-needed.png'; " +"md5=3cd74cebc8d1d5e2c23b4419e28f6c11" + +#. 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/vinagre.xml:432(None) +msgid "" +"@@image: 'figures/vinagre-bookmarks-side-panel.png'; " +"md5=c657cdff0da28c73ac936227e490bb2e" +msgstr "" +"@@image: 'figures/vinagre-bookmarks-side-panel.png'; " +"md5=c657cdff0da28c73ac936227e490bb2e" + +#. 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/vinagre.xml:462(None) +msgid "" +"@@image: 'figures/vinagre-saving-bookmarks.png'; " +"md5=b99dbef848c5c0d487caecc320ed95de" +msgstr "" +"@@image: 'figures/vinagre-saving-bookmarks.png'; " +"md5=b99dbef848c5c0d487caecc320ed95de" + +#. 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/vinagre.xml:495(None) +msgid "" +"@@image: 'figures/vinagre-editing-bookmarks.png'; " +"md5=ac5097a12572cfce0561f0ca19bb1edb" +msgstr "" +"@@image: 'figures/vinagre-editing-bookmarks.png'; " +"md5=ac5097a12572cfce0561f0ca19bb1edb" #: C/vinagre.xml:25(title) msgid "Vinagre Manual" @@ -31,8 +81,8 @@ msgstr "Vinagre je prohlížeč vzdálené plochy" #: C/vinagre.xml:32(year) -msgid "2007, 2008" -msgstr "2007, 2008" +msgid "2007, 2008, 2009" +msgstr "2007, 2008, 2009" #: C/vinagre.xml:33(holder) msgid "Jonh Wendell (wendell@bani.com.br)" @@ -121,6 +171,16 @@ "VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " "POSSIBILITY OF SUCH DAMAGES." msgstr "" +"ZA ŽÁDNÝCH OKOLNOSTÍ A ŽÁDNÝCH PRÁVNÍCH PŘEDPOKLADŮ, AŤ SE JEDNÁ O PŘEČIN " +"(VČETNĚ NEDBALOSTNÍCH), SMLOUVU NEBO JINÉ, NENÍ AUTOR, PŮVODNÍ PISATEL, " +"KTERÝKOLIV PŘISPĚVATEL NEBO KTERÝKOLIV DISTRIBUTOR TOHOTO DOKUMENTU NEBO " +"UPRAVENÉ VERZE DOKUMENTU NEBO KTERÝKOLIV DODAVATEL NĚKTERÉ Z TĚCHTO STRAN " +"ODPOVĚDNÝ NĚJAKÉ OSOBĚ ZA PŘÍMÉ, NEPŘÍMÉ, SPECIÁLNÍ, NAHODILÉ NEBO NÁSLEDNÉ " +"ŠKODY JAKÉHOKOLIV CHARAKTERU, VČETNĚ, ALE NEJEN, ZA POŠKOZENÍ ZE ZTRÁTY " +"DOBRÉHO JMÉNA, PŘERUŠENÍ PRÁCE, PORUCHY NEBO NESPRÁVNÉ FUNKCE POČÍTAČE NEBO " +"JINÉHO A VŠECH DALŠÍCH ŠKOD NEBO ZTRÁT VYVSTÁVAJÍCÍCH Z NEBO VZTAHUJÍCÍCH SE " +"K POUŽÍVÁNÍ TOHOTO DOKUMENTU NEBO UPRAVENÝCH VERZÍ DOKUMENTU, I KDYŽ BY " +"TAKOVÁTO STRANA BYLA INFORMOVANÁ O MOŽNOSTI TAKOVÉHOTO POŠKOZENÍ." #: C/vinagre.xml:28(para) msgid "" @@ -143,113 +203,147 @@ msgid "vdepizzol@gmail.com" msgstr "vdepizzol@gmail.com" -#: C/vinagre.xml:80(revnumber) +#: C/vinagre.xml:65(firstname) +msgid "Jonh" +msgstr "Jonh" + +#: C/vinagre.xml:66(surname) +msgid "Wendell" +msgstr "Wendell" + +#: C/vinagre.xml:67(email) +msgid "wendell@bani.com.br" +msgstr "wendell@bani.com.br" + +#: C/vinagre.xml:86(revnumber) +msgid "0.3" +msgstr "0.3" + +#: C/vinagre.xml:87(date) +msgid "2009-08-23" +msgstr "2009-08-23" + +#: C/vinagre.xml:89(para) +msgid "Jonh Wendell wendell@bani.com.br" +msgstr "Jonh Wendell wendell@bani.com.br" + +#: C/vinagre.xml:95(revnumber) msgid "0.2" msgstr "0.2" -#: C/vinagre.xml:81(date) +#: C/vinagre.xml:96(date) msgid "2008-01-15" msgstr "2008-01-15" -#: C/vinagre.xml:83(para) +#: C/vinagre.xml:98(para) msgid "Vinicius Depizzol vdepizzol@gmail.com" msgstr "Vinicius Depizzol vdepizzol@gmail.com" -#: C/vinagre.xml:89(revnumber) +#: C/vinagre.xml:104(revnumber) msgid "0.1" msgstr "0.1" -#: C/vinagre.xml:90(date) +#: C/vinagre.xml:105(date) msgid "2007-12-16" msgstr "2007-12-16" -#: C/vinagre.xml:92(para) +#: C/vinagre.xml:107(para) msgid "Jaap A. Haitsma jaap@haitsma.org" msgstr "Jaap A. Haitsma jaap@haitsma.org" -#: C/vinagre.xml:95(para) +#: C/vinagre.xml:110(para) msgid "Jaap A. Haitsma" msgstr "Jaap A. Haitsma" -#: C/vinagre.xml:101(title) +#: C/vinagre.xml:116(title) msgid "Feedback" msgstr "Ohlasy" -#: C/vinagre.xml:102(para) +#: C/vinagre.xml:117(para) msgid "" "To report a bug or make a suggestion regarding the Vinagre application or " -"this manual, follow the directions in the Vinagre Contact " -"Page." -msgstr "" -"Pokud chcete nahlásit chybu, navrhnout zlepšení aplikace nebo této příručky, " -"využijte kontaktů uvedených na kontaktní stránce aplikace Vinagre." +"this manual, please file a bug at GNOME bugzilla page." +msgstr "" +"Pokud chcete oznámit chybu nebo navrhnout vylepšení této aplikace, můžete " +"přidat hlášení o chybě do příslušné sekce nástroje pro sledování " +"chyb." #: C/vinagre.xml:0(application) msgid "Vinagre" msgstr "Vinagre" -#: C/vinagre.xml:116(primary) +#: C/vinagre.xml:131(primary) msgid "remote desktop" msgstr "vzdálená plocha" -#: C/vinagre.xml:122(title) +#: C/vinagre.xml:137(title) msgid "Introduction" msgstr "Úvod" -#: C/vinagre.xml:128(secondary) +#: C/vinagre.xml:143(secondary) msgid "Manual" msgstr "Příručka" -#: C/vinagre.xml:129(tertiary) +#: C/vinagre.xml:144(tertiary) msgid "vinagre" msgstr "vinagre" -#: C/vinagre.xml:132(para) +#: C/vinagre.xml:147(para) msgid "" "The Vinagre application is a Remote Desktop Viewer for the GNOME " -"desktop that uses Virtual Network Computing (VNC) system to " -"remotely control another computer." +"desktop that uses Virtual Network Computing (VNC) system (and " +"possibly other protocols) to remotely control another computer." msgstr "" -"Aplikace Vinagre je prohlížeč vzdálené plochy pro prostředí " -"GNOME a využívá pro vzdálené ovládání počítače systém Virtual " -"Network Computing (VNC)." +"Aplikace Vinagre je prohlížeč vzdálené plochy pro pracovní " +"prostředí GNOME využívající systém Virtual Network Computing " +"(VNC), případně jiné protokoly, k vzdálenému ovládání jiných počítačů." -#: C/vinagre.xml:133(para) +#: C/vinagre.xml:148(para) msgid "Vinagre provides the following features:" msgstr "Vinagre nabízí následující funkce:" -#: C/vinagre.xml:136(para) +#: C/vinagre.xml:151(para) msgid "Connect to several machines at the same time." msgstr "Připojení k více strojům zároveň." -#: C/vinagre.xml:139(para) +#: C/vinagre.xml:154(para) msgid "Store recently connections and allows to bookmark them." msgstr "Ukládání nedávných spojení a možnost přidávání do záložek." -#: C/vinagre.xml:142(para) -msgid "Browse local network for VNC Servers." -msgstr "Procházení VNC serverů v místní síti." +#: C/vinagre.xml:157(para) +msgid "Browse local network for machines." +msgstr "Procházení strojů v místní síti." + +#: C/vinagre.xml:160(para) +msgid "" +"Provide a GNOME Panel applet to quickly access your bookmarked machines." +msgstr "" +"Zobrazovat applet v panelu GNOME, prostřednictvím kterého lze přistupovat ke " +"strojům uloženým v záložkách." -#: C/vinagre.xml:150(title) +#: C/vinagre.xml:163(para) +msgid "Extensible through its plugin structure." +msgstr "Rozšiřitelné pomocí zásuvných modulů." + +#: C/vinagre.xml:171(title) msgid "Getting Started" msgstr "Začínáme" -#: C/vinagre.xml:155(title) +#: C/vinagre.xml:176(title) msgid "Starting Vinagre" msgstr "Spouštění Vinagre" -#: C/vinagre.xml:156(para) +#: C/vinagre.xml:177(para) msgid "You can start Vinagre in the following ways:" msgstr "Vinagre lze spustit několika způsoby:" -#: C/vinagre.xml:159(term) +#: C/vinagre.xml:180(term) msgid "Applications menu" -msgstr "Menu Aplikace" +msgstr "Nabídka Aplikace" -#: C/vinagre.xml:161(para) +#: C/vinagre.xml:182(para) msgid "" "Choose InternetRemote " "Desktop Viewer." @@ -257,135 +351,257 @@ "Zvolte InternetProhlížeč " "vzdálené plochy." -#: C/vinagre.xml:165(term) +#: C/vinagre.xml:186(term) msgid "Command line" msgstr "Příkazová řádka" -#: C/vinagre.xml:167(para) +#: C/vinagre.xml:188(para) msgid "Execute the following command: vinagre" msgstr "Spusťte následující příkaz: vinagre" -#: C/vinagre.xml:174(title) +#: C/vinagre.xml:196(title) +msgid "Starting Vinagre from a command line" +msgstr "Spouštění Vinagre z příkazové řádky" + +#: C/vinagre.xml:197(para) +msgid "" +"You can run Vinagre from a command line and " +"connect to a single machine or multiple machines. To connect to a machine " +"from a command line, type the following command, then press Return:" +msgstr "" +"Vinagre lze spustit z příkazové řádky a připojit " +"se k jednomu nebo více vzdáleným strojům. Pokud se z příkazové řádky chcete " +"připojit k nějakému stroji, napište následující příkaz a stiskněte " +"Enter:" + +#: C/vinagre.xml:198(replaceable) +msgid "hostname_or_ip_address" +msgstr "hostitel_nebo_adresa_ip" + +#: C/vinagre.xml:198(command) +msgid "vinagre " +msgstr "vinagre " + +#: C/vinagre.xml:199(para) +msgid "" +"For more information on how to run Vinagre from a " +"command line, see the unix manual page for Vinagre, Vinagre1." +msgstr "" +"Více informací o provozování Vinagre z příkazové " +"řádky popisuje manuálová stránka balíčku Vinagre, Vinagre1." + +#: C/vinagre.xml:206(title) msgid "The Vinagre Window" msgstr "Okno Vinagre" -#: C/vinagre.xml:176(title) +#: C/vinagre.xml:208(title) msgid "Vinagre window" msgstr "Okno Vinagre" -#: C/vinagre.xml:182(phrase) +#: C/vinagre.xml:214(phrase) msgid "Shows vinagre main window." msgstr "Zobrazí hlavní okno Vinagre." -#: C/vinagre.xml:188(para) +#: C/vinagre.xml:220(para) msgid "" "The Vinagre window contains the following " "elements:" msgstr "Okno Vinagre obsahuje následující prvky:" -#: C/vinagre.xml:193(term) +#: C/vinagre.xml:225(term) msgid "Menubar" -msgstr "Lišta menu" +msgstr "Lišta nabídek" -#: C/vinagre.xml:195(para) +#: C/vinagre.xml:227(para) msgid "" "The menus on the menubar contain all of the commands you need to work with " "remote connections in Vinagre." msgstr "" -"Nabídka menu obsahuje veškeré nezbytné příkazy, které potřebujete pro práci " +"Lušta nabídek obsahuje veškeré nezbytné příkazy, které potřebujete pro práci " "se vzdálenými spojeními ve Vinagre." -#: C/vinagre.xml:199(term) +#: C/vinagre.xml:231(term) msgid "Toolbar" msgstr "Nástrojová lišta" -#: C/vinagre.xml:201(para) +#: C/vinagre.xml:233(para) msgid "" "The toolbar contains a subset of the most used commands that you can access " "from the menubar." msgstr "" "Nástrojová lišta obsahuje výběr nejpoužívanějších příkazů, které jsou " -"dostupné v nabídce menu." +"dostupné v nabídce." -#: C/vinagre.xml:205(term) +#: C/vinagre.xml:237(term) msgid "Display Area" msgstr "Zobrazovací plocha" -#: C/vinagre.xml:207(para) +#: C/vinagre.xml:239(para) msgid "" "The display area contains a list of tabs with the connected machines and its " "remote desktops." msgstr "" -"Zobrazovací plocha obsahuje karty s připojenými stroji a jejich vzdálené " +"Plocha zobrazení obsahuje karty s připojenými stroji a jejich vzdálené " "plochy." -#: C/vinagre.xml:211(term) +#: C/vinagre.xml:243(term) msgid "Statusbar" msgstr "Stavová lišta" -#: C/vinagre.xml:213(para) +#: C/vinagre.xml:245(para) msgid "" "The statusbar displays information about current Vinagre activity and contextual information about the menu items." msgstr "" "Stavová lišta informuje o prováděných akcích Vinagre a kontextovou nápovědu položek v menu." +"application> a kontextovou nápovědu položek v nabídce." -#: C/vinagre.xml:217(term) +#: C/vinagre.xml:249(term) msgid "Side Pane" msgstr "Boční panel" -#: C/vinagre.xml:219(para) -msgid "The side pane contains a list of bookmarked connections." -msgstr "Boční panel obsahuje seznam záložek s uloženými připojeními." +#: C/vinagre.xml:251(para) +msgid "" +"The side pane contains a list of bookmarked connections and (if available) a " +"list of auto-discovered network machines." +msgstr "" +"Boční panel obsahuje seznam záložek s uloženými připojeními a (pokud je " +"služba dostupná) seznam automaticky vyhledaných strojů v síti." + +#: C/vinagre.xml:259(title) +msgid "Some notes about Vinagre" +msgstr "Několik poznámek o Vinagre" -#: C/vinagre.xml:228(title) +#: C/vinagre.xml:260(para) +msgid "" +"As a tool to access other machines, Vinagre behaves slightly different than " +"other GNOME applications in its default " +"installation." +msgstr "" +"Protože je Vinagre nástroj pro přístup k jiným strojům, chová se ve výchozím " +"nastavení trochu odlišně od běžných aplikací pro GNOME." + +#: C/vinagre.xml:261(para) +msgid "" +"Vinagre comes with menu accelerators and keyboard shortcuts disabled by " +"default. This avoids keys being intercepted by Vinagre when you wanted to " +"send those keys to the remote machine." +msgstr "" +"Vinagre má ve výchozím nastavení zakázané všechny klávesové zkratky. To " +"umožňuje jejich použití v situaci, kdy chcete nějakou odeslat vzdálenému " +"stroji." + +#: C/vinagre.xml:262(para) +msgid "" +"For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by " +"default." +msgstr "" +"Například klávesová zkratka Ctrl+W slouží k uzavření " +"karty, ale tato kombinace kláves bude, ve výchozím nastavení, odeslána " +"vzdálenému stroji." + +#: C/vinagre.xml:263(para) +msgid "" +"If you want to change this behavior, go to Vinagre preferences in " +"EditPreferences." +msgstr "" +"Pokud chcete změnit chování nástroje Vinagre, přejděte do nastavení, které " +"se nachází v nabídce UpravitNastavení." + +#: C/vinagre.xml:275(title) msgid "Using Vinagre" msgstr "Používání Vinagre" -#: C/vinagre.xml:231(title) -msgid "To connect with a remote machine" +#: C/vinagre.xml:278(title) +msgid "To connect to a remote machine" msgstr "Připojení ke vzdálenému stroji" -#: C/vinagre.xml:234(title) -msgid "Informing Host address" +#: C/vinagre.xml:281(title) +msgid "Informing a host address" msgstr "Zadání adresy hostitele" -#: C/vinagre.xml:235(para) +#: C/vinagre.xml:282(para) msgid "" "To connect with a remote machine, choose " "CtrlNMachineConnect. The Connection Dialog is " -"displayed. Inform the Host and the PortProtocol and the Host of the connection and click the Connect " -"button. You can also use the Find button to browse " -"available machines on local network." +"button. You will see a bunch of options depending on what protocol you have " +"selected." msgstr "" "Pokud se chcete připojit ke vzdálenému stroji, zvolte " "CtrlNStrojPřipojit. Bude zobrazeno Okno připojení. Zadejte Hostitele a Port pro připojení a klepněte na tlačítko Připojit. Také můžete využít tlačítka Hledat k " -"procházení dostupných hostitelů v místní síti." - -#: C/vinagre.xml:246(para) -msgid "" -"Some machines may require a secure connection. In this case, a " -"Password dialog will be displayed asking for the " -"connection password. If you check Remember this password. Zadejte Protokol a Hostitele a klepněte na tlačítko Připojit. Zobrazí se " +"další možnosti v závislosti na zvoleném protokolu." + +#: C/vinagre.xml:294(title) +msgid "Connect dialog" +msgstr "Okno připojení" + +#: C/vinagre.xml:300(phrase) +msgid "Shows the connect dialog." +msgstr "Zobrazuje okno připojení" + +#: C/vinagre.xml:306(para) +msgid "" +"You can also use the Find button to browse available " +"machines on local network." +msgstr "" +"Také můžete použít tlačítko Hledat pro procházení " +"dostupných strojů v místní síti." + +#: C/vinagre.xml:310(para) +msgid "" +"The availabity of the Find button depends on the " +"protocol you have selected. Vinagre relies on Avahi service to browse for machines in your local network. Also, " +"notice that Vinagre can be compiled without Avahi " +"support. In this case, this button will not be available." +msgstr "" +"Dostupnost tlačítka Hledat závisí na zvoleném " +"protokolu. Vinagre využívá k hledání strojů v místní síti službu " +"Avahi, ale lze jej zkompilovat i bez její " +"podpory. V takovém případě nebude tlačítko dostupné." + +#: C/vinagre.xml:318(para) +msgid "" +"Some machines may require a secure connection. In this case, an " +"Authentication dialog will be displayed asking for the " +"credentials. The type of credentials depends on the server. It may be a " +"password and an username. If you check Remember this credential, Vinagre will store the secure " "information using GNOME Keyring Manager." msgstr "" "Některé stroje mohou vyžadovat zabezpečené spojení. V takovém případě se " -"zobrazí okno vyžadující Heslo pro dané připojení. Pokud " -"zaškrtnete Zapamatovat si heslo, Vinagre bezpečně uloží informace do Správce klíčenek pro " -"GNOME." +"zobrazí okno Ověření vyžadující zadání přihlašovacích " +"údajů. Druh přihlašovacích údajů závisí na serveru, může to být uživatelské " +"jméno a heslo. Pokud zaškrtnete Zapamatovat si přihlašovací údaje, Vinagre bezpečně uloží informace do " +"Správce klíčenek pro GNOME." + +#: C/vinagre.xml:326(title) +msgid "Authentication dialog" +msgstr "Okno ověření" + +#: C/vinagre.xml:332(phrase) +msgid "Shows the authentication dialog." +msgstr "Zobrazuje okno Ověření." -#: C/vinagre.xml:253(para) +#: C/vinagre.xml:337(para) msgid "" "If the connection has been used previously, you can also access it by " "MachineRecent connections...StrojNedávná spojení...." -#: C/vinagre.xml:263(title) +#: C/vinagre.xml:347(title) msgid "Opening a Remote Connection File" msgstr "Otevření souboru vzdáleného připojení" -#: C/vinagre.xml:264(para) +#: C/vinagre.xml:348(para) msgid "" "Some hosts distribute remote connection files (generally ending with suffix " "\".vnc\") instead of inform Host address and Port. To open a remote " @@ -418,7 +634,7 @@ "guilabel>. Vyberte soubor, který chcete otevřít, a pak klepněte na tlačítko " "Otevřít." -#: C/vinagre.xml:276(para) +#: C/vinagre.xml:360(para) msgid "" "You can also double-click on a remote connection file in the " "Nautilus file manager to open it on the " @@ -428,87 +644,61 @@ "na soubor vzdáleného připojení k jeho spuštění v okně Vinagre." -#: C/vinagre.xml:284(title) -msgid "To Create a New Bookmark" -msgstr "Vytvoření nové záložky" +#: C/vinagre.xml:367(title) C/vinagre.xml:419(title) C/vinagre.xml:422(title) +msgid "Using Bookmarks" +msgstr "Používání záložek" -#: C/vinagre.xml:285(para) +#: C/vinagre.xml:368(para) msgid "" -"To bookmark the currently viewed connection, choose " -"CtrlDBookmarksAdd to " -"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and click " -"Ok." +"You can access your mostly used connections through bookmarks. See the Bookmarks chapter." msgstr "" -"Chcete-li přidat aktuálně prohlížené připojení mezi záložky, zvolte " -"CtrlDZáložkyPřidat do " -"záložek. Objeví se okno Ukládání do " -"záložek. Zadejte jméno připojení a klepněte na tlačítko " -"Budiž." +"K nejčastěji používaným spojením můžete přistupovat pomocí záložek. Vice " +"popisuje kapitola o záložkách." -#: C/vinagre.xml:296(title) -msgid "To Remove a Bookmark" -msgstr "Odstranění záložky" - -#: C/vinagre.xml:297(para) -msgid "" -"To remove a bookmark, choose Remove from the " -"context menu of the bookmark in the Side Pane." -msgstr "" -"Záložku odstraníte zvolením položky Odstranit ze záložek z kontextové nabídky záložky v bočním panelu." - -#: C/vinagre.xml:304(title) -msgid "To Edit a Bookmark's Properties" -msgstr "Úprava vlastností záložky" - -#: C/vinagre.xml:305(para) -msgid "" -"To edit a bookmark's properties, such as it's name and host, choose " -"Edit from the context menu of the bookmark in the " -"Side Pane." -msgstr "" -"Pro úpravu vlastností záložky, například názvu a adresy, zvolte " -"Upravit z kontextové nabídky záložky v bočním " -"panelu." - -#: C/vinagre.xml:312(title) +#: C/vinagre.xml:376(title) msgid "To Use Full Screen Mode" msgstr "Používání režimu celé obrazovky" -#: C/vinagre.xml:313(para) +#: C/vinagre.xml:377(para) msgid "" "To zoom the Display Area to full screen mode, choose " "F11ViewFull Screen. To exit full " -"screen mode, press F11 or CtrlAlt." +"guimenu>Full Screen or the " +"corresponding tool bar button." msgstr "" "Pro zobrazení na celou obrazovku zvolte z nabídky " "F11ZobrazitCelá obrazovka. Režim celé " -"obrazovky také spustíte stisknutím F11 nebo kombinaci " -"kláves CtrlAlt." +"guimenu>Celá obrazovka nebo klepněte " +"na odpovídající tlačítko lišty nástrojů." -#: C/vinagre.xml:324(title) +#: C/vinagre.xml:385(para) +msgid "" +"While in full screen mode, move the mouse to the top center of the screen to " +"show a hidden tool bar, which has buttons to leave full screen mode, close " +"the connection and other options." +msgstr "" +"Pokud v režimu celé obrazovky přesunete kurzor na středu horního okraje " +"obrazovky, zobrazí se skrytá nástrojová lišta obsahující tlačítka s funkcemi " +"pro opuštění režimu celé obrazovky, ukončení spojení a jiné." + +#: C/vinagre.xml:394(title) msgid "To Close a Connection" msgstr "Ukončení spojení" -#: C/vinagre.xml:325(para) +#: C/vinagre.xml:395(para) msgid "" "To close a connection, choose MachineClose." msgstr "" -"Spojení ukončíte, pokud z nabídky menu vyberete StrojStrojZavřít." -#: C/vinagre.xml:334(title) +#: C/vinagre.xml:404(title) msgid "To Take Screenshot" msgstr "Získání snímku obrazovky" -#: C/vinagre.xml:335(para) +#: C/vinagre.xml:405(para) msgid "" "To take screenshot of the current remote desktop, choose " "MachineTake ScreenshotUložit snímek obrazovky klepněte na tlačítko " "Uložit pro uložení snímku." -#: C/vinagre.xml:349(title) +#: C/vinagre.xml:423(para) +msgid "" +"Bookmarks are a resource to keep around machines you access frequently. They " +"are visible at side panel or in the Bookmarks menu." +msgstr "" +"Záložky jsou způsob, jak organizovat opakovaný přístup k téže strojům. " +"Zobrazují se v bočním panelu nebo v nabídce Záložky." + +#: C/vinagre.xml:428(title) +msgid "Bookmarks at side panel" +msgstr "Záložky v bočním panelu" + +#: C/vinagre.xml:434(phrase) +msgid "Shows bookmarks at side panel." +msgstr "Zobrazuje záložky v bočním panelu." + +#: C/vinagre.xml:440(para) +msgid "" +"As you move the mouse around the entries, a tooltip will show you the " +"hostname of the connection. To connect to a machine, just double click on a " +"entry." +msgstr "" +"Přesunutím kurzoru myši nad nějakou položku zobrazíte v bublinové nápovědě " +"hostitele daného spojení. Pokud se chcete ke stroji připojit, poklepejte na " +"příslušnou položku." + +#: C/vinagre.xml:447(title) +msgid "To Create a New Bookmark" +msgstr "Vytvoření nové záložky" + +#: C/vinagre.xml:448(para) +msgid "" +"To bookmark the currently viewed connection, choose " +"CtrlDBookmarksAdd to " +"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and " +"optionally other data, such as the folder and click Save." +msgstr "" +"Chcete-li přidat aktuálně prohlížené spojení mezi záložky, zvolte " +"CtrlDZáložkyPřidat do " +"záložek. Objeví se okno Ukládání do " +"záložek. Zadejte jméno připojení a případně další údaje a " +"klepněte na tlačítko Uložit." + +#: C/vinagre.xml:458(title) +msgid "Saving a bookmark" +msgstr "Ukládání záložek" + +#: C/vinagre.xml:464(phrase) +msgid "Shows the Saving to Bookmarks dialog." +msgstr "Zobrazuje okno Ukládání do záložek." + +#: C/vinagre.xml:471(para) +msgid "" +"You can use folders to organize your bookmarks. To create a folder, right " +"click in the side panel and choose the option New Folder " +"in the context menu, or go to menu BookmarksNew Folder." +msgstr "" +"K organizaci záložek můžete použít složky. Novou složku vytvoříte, pokud " +"klepnete pravým tlačítkem do bočního panelu a z kontextové nabídky vyberete " +"Nová složka. Další možností je zvolit z nabídky " +"ZáložkyNová složka." + +#: C/vinagre.xml:484(title) +msgid "To Edit a Bookmark's Properties" +msgstr "Úprava vlastností záložky" + +#: C/vinagre.xml:485(para) +msgid "" +"To edit a bookmark's properties, such as it's name and host, choose " +"Edit bookmark from the context menu of the " +"bookmark in the Side Pane. The same dialog as shown above will be displayed." +msgstr "" +"Pokud chcete upravit vlastnosti záložky, například název a hostitele, zvolte " +"Upravit z kontextové nabídky záložky v bočním " +"panelu. Objeví se stejné okno jako je zobrazeno výše." + +#: C/vinagre.xml:491(title) +msgid "Editing a bookmark" +msgstr "Úprava záložky" + +#: C/vinagre.xml:497(phrase) +msgid "Context menu option to edit a bookmark" +msgstr "Položka kontextové nabídky sloužící k úpravám záložky" + +#: C/vinagre.xml:503(para) +msgid "You can also edit a folder." +msgstr "Také lze upravovat složky." + +#: C/vinagre.xml:507(title) +msgid "To Remove a Bookmark" +msgstr "Odstranění záložky" + +#: C/vinagre.xml:508(para) +msgid "" +"To remove a bookmark, choose Remove from bookmarks from " +"the context menu of the bookmark in the Side Pane." +msgstr "" +"Záložku odstraníte, když vyberete položku Odstranit ze záložek z kontextové nabídky záložky v bočním panelu." + +#: C/vinagre.xml:512(para) +msgid "" +"You can also remove a folder. Notice that removing a folder will remove all " +"its entries. A confirmation dialog will be shown." +msgstr "" +"Složky lze také odstraňovat. Mějte na paměti, že spolu se složkou odstraníte " +"i všechny obsažené položky. Před vymazáním se zobrazí okno s žádostí o " +"potvrzení." + +#: C/vinagre.xml:518(title) +msgid "Preferences" +msgstr "Nastavení" + +#: C/vinagre.xml:519(para) +msgid "" +"To configure Vinagre, choose " +"EditPreferences. The Preferences dialog contains the " +"following items:" +msgstr "" +"Pokud chcete upravit konfiguraci Vinagre, zvolte " +"z nabídky UpravitNastavení. Okno Nastavení obsahuje " +"následující prvky:" + +#: C/vinagre.xml:523(guilabel) +msgid "Always show tabs" +msgstr "Vždy zobrazovat karty" + +#: C/vinagre.xml:525(para) +msgid "" +"Select this option to make the tabs always visible, even when only one " +"connection is active." +msgstr "" +"Tato volba způsobí, že bude lišta s kartami neustále zobrazena, i když bude " +"aktivní jen jedno spojení." + +#: C/vinagre.xml:530(guilabel) +msgid "Show menu shortcuts" +msgstr "Zobrazovat klávesové zkratky nabídky" + +#: C/vinagre.xml:532(para) +msgid "" +"By selecting this option, keyboard shortcuts, like Ctrl+D and menu accelerators, like Alt+M to access " +"the Machine menu, will be enabled. This means that Vinagre will catch those " +"key combinations, instead of sending them to the remote machine. Because " +"most of the time you will be working on the remote machine, this option " +"comes disabled by default." +msgstr "" +"Pomocí této volby povolíte klávesobé zkratky (jako Ctrl+D) nebo akcelerátory nabídek (jako Alt+S pro " +"přístup do nabídky Stroj). To znamená, že Vinagre bude tyto zkratky " +"zachytávat namísto jejich předávání vzdálenému stroji. Protože se " +"předpokládá, že většinu času budete trávit prací na vzdálených strojích, je " +"tato volba ve výchozím nastavení zakázána." + +#: C/vinagre.xml:543(title) msgid "About" msgstr "O aplikaci" -#: C/vinagre.xml:350(para) +#: C/vinagre.xml:544(para) msgid "" "Vinagre was written by Jonh Wendell wendell@bani.com.br. To " "find more information about Vinagre, please visit the VinagreVinagre web page." msgstr "" "Vinagre napsal Jonh Wendell wendell@bani.com.br. Pokud chcete " -"zjistit další informace, navštivte prosím WWW stránku aplikace VinagreWWW stránku aplikace Vinagre." -#: C/vinagre.xml:356(para) +#: C/vinagre.xml:549(para) msgid "" "To report a bug or make a suggestion regarding this application you can file " "a bug in our nástroje pro sledování chyb." -#: C/vinagre.xml:362(para) +#: C/vinagre.xml:555(para) msgid "" "This program is distributed under the terms of the GNU General Public " "license as published by the Free Software Foundation; either version 2 of " @@ -568,4 +921,15 @@ #. Put one translator per line, in the form of NAME , YEAR1, YEAR2. #: C/vinagre.xml:0(None) msgid "translator-credits" -msgstr "Lucas Lommer , 2008." +msgstr "Lucas Lommer , 2008, 2009." + +#~ msgid "" +#~ "To report a bug or make a suggestion regarding the Vinagre application or " +#~ "this manual, follow the directions in the Vinagre " +#~ "Contact Page." +#~ msgstr "" +#~ "Pokud chcete nahlásit chybu, navrhnout zlepšení aplikace nebo této " +#~ "příručky, využijte kontaktů uvedených na kontaktní stránce aplikace " +#~ "Vinagre." diff -Nru vinagre-2.26.1/help/cs/vinagre.xml vinagre-2.29.1/help/cs/vinagre.xml --- vinagre-2.26.1/help/cs/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/cs/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -148,7 +145,7 @@ vinagre - Aplikace Vinagre je prohlížeč vzdálené plochy pro prostředí GNOME a využívá pro vzdálené ovládání počítače systém Virtual Network Computing (VNC). + Aplikace Vinagre je prohlížeč vzdálené plochy pro pracovní prostředí GNOME využívající systém Virtual Network Computing (VNC), případně jiné protokoly, k vzdálenému ovládání jiných počítačů. Vinagre nabízí následující funkce: @@ -158,7 +155,13 @@ Ukládání nedávných spojení a možnost přidávání do záložek. - Procházení VNC serverů v místní síti. + Procházení strojů v místní síti. + + + Zobrazovat applet v panelu GNOME, prostřednictvím kterého lze přistupovat ke strojům uloženým v záložkách. + + + Rozšiřitelné pomocí zásuvných modulů. @@ -170,12 +173,12 @@ -
+
Spouštění Vinagre Vinagre lze spustit několika způsoby: - Menu Aplikace + Nabídka Aplikace Zvolte InternetProhlížeč vzdálené plochy. @@ -188,8 +191,19 @@
- -
+ + +
+ Spouštění Vinagre z příkazové řádky + Vinagre lze spustit z příkazové řádky a připojit se k jednomu nebo více vzdáleným strojům. Pokud se z příkazové řádky chcete připojit k nějakému stroji, napište následující příkaz a stiskněte Enter: + vinagre hostitel_nebo_adresa_ip + Více informací o provozování Vinagre z příkazové řádky popisuje manuálová stránka balíčku Vinagre, Vinagre1. +
+ + + + +
Okno Vinagre
Okno Vinagre @@ -208,38 +222,47 @@ - Lišta menu + Lišta nabídek - Nabídka menu obsahuje veškeré nezbytné příkazy, které potřebujete pro práci se vzdálenými spojeními ve Vinagre. + Lušta nabídek obsahuje veškeré nezbytné příkazy, které potřebujete pro práci se vzdálenými spojeními ve Vinagre. Nástrojová lišta - Nástrojová lišta obsahuje výběr nejpoužívanějších příkazů, které jsou dostupné v nabídce menu. + Nástrojová lišta obsahuje výběr nejpoužívanějších příkazů, které jsou dostupné v nabídce. Zobrazovací plocha - Zobrazovací plocha obsahuje karty s připojenými stroji a jejich vzdálené plochy. + Plocha zobrazení obsahuje karty s připojenými stroji a jejich vzdálené plochy. Stavová lišta - Stavová lišta informuje o prováděných akcích Vinagre a kontextovou nápovědu položek v menu. + Stavová lišta informuje o prováděných akcích Vinagre a kontextovou nápovědu položek v nabídce. Boční panel - Boční panel obsahuje seznam záložek s uloženými připojeními. + Boční panel obsahuje seznam záložek s uloženými připojeními a (pokud je služba dostupná) seznam automaticky vyhledaných strojů v síti.
+ +
+ Několik poznámek o Vinagre + Protože je Vinagre nástroj pro přístup k jiným strojům, chová se ve výchozím nastavení trochu odlišně od běžných aplikací pro GNOME. + Vinagre má ve výchozím nastavení zakázané všechny klávesové zkratky. To umožňuje jejich použití v situaci, kdy chcete nějakou odeslat vzdálenému stroji. + Například klávesová zkratka Ctrl+W slouží k uzavření karty, ale tato kombinace kláves bude, ve výchozím nastavení, odeslána vzdálenému stroji. + Pokud chcete změnit chování nástroje Vinagre, přejděte do nastavení, které se nachází v nabídce UpravitNastavení. +
+
@@ -250,10 +273,39 @@
Zadání adresy hostitele - Pokud se chcete připojit ke vzdálenému stroji, zvolte CtrlNStrojPřipojit. Bude zobrazeno Okno připojení. Zadejte Hostitele a Port pro připojení a klepněte na tlačítko Připojit. Také můžete využít tlačítka Hledat k procházení dostupných hostitelů v místní síti. + Pokud se chcete připojit ke vzdálenému stroji, zvolte CtrlNStrojPřipojit. Bude zobrazeno Okno připojení. Zadejte Protokol a Hostitele a klepněte na tlačítko Připojit. Zobrazí se další možnosti v závislosti na zvoleném protokolu. + +
+ Okno připojení + + + + + + Zobrazuje okno připojení + + + +
+ + Také můžete použít tlačítko Hledat pro procházení dostupných strojů v místní síti. - Některé stroje mohou vyžadovat zabezpečené spojení. V takovém případě se zobrazí okno vyžadující Heslo pro dané připojení. Pokud zaškrtnete Zapamatovat si heslo, Vinagre bezpečně uloží informace do Správce klíčenek pro GNOME. + Dostupnost tlačítka Hledat závisí na zvoleném protokolu. Vinagre využívá k hledání strojů v místní síti službu Avahi, ale lze jej zkompilovat i bez její podpory. V takovém případě nebude tlačítko dostupné. + + Některé stroje mohou vyžadovat zabezpečené spojení. V takovém případě se zobrazí okno Ověření vyžadující zadání přihlašovacích údajů. Druh přihlašovacích údajů závisí na serveru, může to být uživatelské jméno a heslo. Pokud zaškrtnete Zapamatovat si přihlašovací údaje, Vinagre bezpečně uloží informace do Správce klíčenek pro GNOME. +
+ Okno ověření + + + + + + Zobrazuje okno Ověření. + + +
+ Pokud jste již dříve dané připojení použili, můžete se k němu dostat také z nabídky StrojNedávná spojení....
@@ -265,31 +317,25 @@ Také můžete ve správci souborů Nautilus poklepat na soubor vzdáleného připojení k jeho spuštění v okně Vinagre.
-
- -
- Vytvoření nové záložky - Chcete-li přidat aktuálně prohlížené připojení mezi záložky, zvolte CtrlDZáložkyPřidat do záložek. Objeví se okno Ukládání do záložek. Zadejte jméno připojení a klepněte na tlačítko Budiž. -
- -
- Odstranění záložky - Záložku odstraníte zvolením položky Odstranit ze záložek z kontextové nabídky záložky v bočním panelu. -
- -
- Úprava vlastností záložky - Pro úpravu vlastností záložky, například názvu a adresy, zvolte Upravit z kontextové nabídky záložky v bočním panelu. + +
+ Používání záložek + K nejčastěji používaným spojením můžete přistupovat pomocí záložek. Vice popisuje kapitola o záložkách. +
+
- Používání režimu celé obrazovky - Pro zobrazení na celou obrazovku zvolte z nabídky F11ZobrazitCelá obrazovka. Režim celé obrazovky také spustíte stisknutím F11 nebo kombinaci kláves CtrlAlt. + Používání režimu celé obrazovky + Pro zobrazení na celou obrazovku zvolte z nabídky F11ZobrazitCelá obrazovka nebo klepněte na odpovídající tlačítko lišty nástrojů. + + Pokud v režimu celé obrazovky přesunete kurzor na středu horního okraje obrazovky, zobrazí se skrytá nástrojová lišta obsahující tlačítka s funkcemi pro opuštění režimu celé obrazovky, ukončení spojení a jiné. +
Ukončení spojení - Spojení ukončíte, pokud z nabídky menu vyberete StrojZavřít. + Spojení ukončíte, pokud z nabídky vyberete StrojZavřít.
@@ -300,9 +346,105 @@
+
+ Používání záložek + +
+ Používání záložek + Záložky jsou způsob, jak organizovat opakovaný přístup k téže strojům. Zobrazují se v bočním panelu nebo v nabídce Záložky. + +
+ Záložky v bočním panelu + + + + + + Zobrazuje záložky v bočním panelu. + + + +
+ + Přesunutím kurzoru myši nad nějakou položku zobrazíte v bublinové nápovědě hostitele daného spojení. Pokud se chcete ke stroji připojit, poklepejte na příslušnou položku. + +
+ +
+ Vytvoření nové záložky + Chcete-li přidat aktuálně prohlížené spojení mezi záložky, zvolte CtrlDZáložkyPřidat do záložek. Objeví se okno Ukládání do záložek. Zadejte jméno připojení a případně další údaje a klepněte na tlačítko Uložit. + +
+ Ukládání záložek + + + + + + Zobrazuje okno Ukládání do záložek. + + + +
+ + + K organizaci záložek můžete použít složky. Novou složku vytvoříte, pokud klepnete pravým tlačítkem do bočního panelu a z kontextové nabídky vyberete Nová složka. Další možností je zvolit z nabídky ZáložkyNová složka. + + +
+ +
+ Úprava vlastností záložky + Pokud chcete upravit vlastnosti záložky, například název a hostitele, zvolte Upravit z kontextové nabídky záložky v bočním panelu. Objeví se stejné okno jako je zobrazeno výše. + +
+ Úprava záložky + + + + + + Položka kontextové nabídky sloužící k úpravám záložky + + + +
+ + Také lze upravovat složky. +
+ +
+ Odstranění záložky + Záložku odstraníte, když vyberete položku Odstranit ze záložek z kontextové nabídky záložky v bočním panelu. + Složky lze také odstraňovat. Mějte na paměti, že spolu se složkou odstraníte i všechny obsažené položky. Před vymazáním se zobrazí okno s žádostí o potvrzení. +
+ +
+ +
+ Nastavení + Pokud chcete upravit konfiguraci Vinagre, zvolte z nabídky UpravitNastavení. Okno Nastavení obsahuje následující prvky: + + + + Vždy zobrazovat karty + + Tato volba způsobí, že bude lišta s kartami neustále zobrazena, i když bude aktivní jen jedno spojení. + + + + + Zobrazovat klávesové zkratky nabídky + + Pomocí této volby povolíte klávesobé zkratky (jako Ctrl+D) nebo akcelerátory nabídek (jako Alt+S pro přístup do nabídky Stroj). To znamená, že Vinagre bude tyto zkratky zachytávat namísto jejich předávání vzdálenému stroji. Protože se předpokládá, že většinu času budete trávit prací na vzdálených strojích, je tato volba ve výchozím nastavení zakázána. + + + +
+
O aplikaci - Vinagre napsal Jonh Wendell wendell@bani.com.br. Pokud chcete zjistit další informace, navštivte prosím WWW stránku aplikace Vinagre. + Vinagre napsal Jonh Wendell wendell@bani.com.br. Pokud chcete zjistit další informace, navštivte prosím WWW stránku aplikace Vinagre. Pokud chcete oznámit chybu nebo navrhnout vylepšení této aplikace, můžete přidat hlášení o chybě do příslušné sekce nástroje pro sledování chyb. Tento program je šířen podle ustanovení GNU General Public License, vydávané Free Software Foundation; a to buď verze 2 této licence anebo (podle vlastního uvážení) kterékoliv pozdější verze. Kopii této licence naleznete na stránce projektu GNU nebo v souboru COPYING přiloženém ke zdrojovým kódům tohoto programu.
diff -Nru vinagre-2.26.1/help/de/de.po vinagre-2.29.1/help/de/de.po --- vinagre-2.26.1/help/de/de.po 2009-04-13 14:36:21.000000000 +0100 +++ vinagre-2.29.1/help/de/de.po 2009-10-26 13:44:11.000000000 +0000 @@ -1,11 +1,11 @@ -# German translation of the vinagre manual +# German translation of the vinagre manual. # Mario Blättermann , 2008, 2009. # msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2008-12-11 20:47+0000\n" -"PO-Revision-Date: 2009-01-31 13:06+0100\n" +"POT-Creation-Date: 2009-08-25 00:54+0000\n" +"PO-Revision-Date: 2009-08-25 21:43+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -17,11 +17,51 @@ #. 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/vinagre.xml:180(None) +#: C/vinagre.xml:212(None) msgid "" "@@image: 'figures/vinagre-screenshot.png'; " -"md5=5ea2ba4ba469dadea877f19b6b33ced2" -msgstr "translated" +"md5=dc88b591b3b8ed3a49335c5431806c13" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:298(None) +msgid "" +"@@image: 'figures/vinagre-connect-dialog.png'; " +"md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:330(None) +msgid "" +"@@image: 'figures/vinagre-auth-needed.png'; " +"md5=3cd74cebc8d1d5e2c23b4419e28f6c11" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:432(None) +msgid "" +"@@image: 'figures/vinagre-bookmarks-side-panel.png'; " +"md5=c657cdff0da28c73ac936227e490bb2e" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:462(None) +msgid "" +"@@image: 'figures/vinagre-saving-bookmarks.png'; " +"md5=b99dbef848c5c0d487caecc320ed95de" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:495(None) +msgid "" +"@@image: 'figures/vinagre-editing-bookmarks.png'; " +"md5=ac5097a12572cfce0561f0ca19bb1edb" +msgstr "" #: C/vinagre.xml:25(title) msgid "Vinagre Manual" @@ -33,8 +73,8 @@ "Vinagre ist ein Betrachter für entfernte Desktops" #: C/vinagre.xml:32(year) -msgid "2007, 2008" -msgstr "2007, 2008" +msgid "2007, 2008, 2009" +msgstr "2007, 2008, 2009" #: C/vinagre.xml:33(holder) msgid "Jonh Wendell (wendell@bani.com.br)" @@ -50,8 +90,8 @@ "the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " "later version published by the Free Software Foundation with no Invariant " "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " -"in the file COPYING-DOCS distributed with this manual." +"of the GFDL at this link or in " +"the file COPYING-DOCS distributed with this manual." msgstr "" "Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free " "Documentation License (GFDL), Version 1.1 oder jeder späteren, von der Free " @@ -94,14 +134,14 @@ "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " "EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " "THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS " -"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE " -"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " -"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " -"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " -"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " -"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " -"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " -"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK " +"AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED " +"VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION " +"PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY " +"CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR " +"CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS " +"LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS " +"AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" msgstr "" "DIESES DOKUMENT WIRD »WIE VORLIEGEND« GELIEFERT, OHNE GARANTIEN IRGENDEINER " "ART, SOWOHL AUSDRÜCKLICH GENANNTE ALS AUCH ANGEDEUTETE. DIES BEZIEHT SICH " @@ -110,8 +150,8 @@ "ZWECK GEEIGNET IST ODER DASS ES KEINE RECHTE DRITTER VERLETZT. DAS VOLLE " "RISIKO WAS QUALITÄT, GENAUIGKEIT UND LEISTUNG DES DOKUMENTS ODER VERÄNDERTE " "FASSUNGEN DES DOKUMENTS LIEGT BEI IHNEN. SOLLTE EIN DOKUMENT ODER EINE " -"VERÄNDERTE FASSUNG DAVON FEHLER IRGENDEINER ART BEINHALTEN, TRAGEN SIE " -"(NICHT DER URSPRUNGSAUTOR, DER AUTOR ODER EIN MITWIRKENDER) DIE KOSTEN FÜR " +"VERÄNDERTE FASSUNG DAVON FEHLER IRGENDEINER ART BEINHALTEN, TRAGEN SIE (NICHT " +"DER URSPRUNGSAUTOR, DER AUTOR ODER EIN MITWIRKENDER) DIE KOSTEN FÜR " "NOTWENDIGE DIENSTLEISTUNGEN, REPARATUREN ODER FEHLERKORREKTUREN. DIESER " "HAFTUNGSAUSSCHLUSS IST EIN ESSENZIELLER TEIL DIESER LIZENZ. DIE VERWENDUNG " "EINES DOKUMENTS ODER EINER VERÄNDERTEN VERSION DES DOKUMENTS IST NICHT " @@ -122,11 +162,11 @@ "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " "NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " "CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE " -"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON " -"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF " -"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, " -"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES " -"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " +"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR " +"ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY " +"CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK " +"STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR " +"LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " "VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " "POSSIBILITY OF SUCH DAMAGES." msgstr "" @@ -135,13 +175,13 @@ "ANDERWEITIG KANN DER AUTOR, URSPRUNGSAUTOR, EIN MITWIRKENDER ODER EIN " "VERTRIEBSPARTNER DIESES DOKUMENTS ODER EINER VERÄNDERTEN FASSUNG DES " "DOKUMENTS ODER EIN ZULIEFERER EINER DIESER PARTEIEN, HAFTBAR GEMACHT WERDEN " -"FÜR DIREKTE, INDIREKTE, SPEZIELLE, VERSEHENTLICHE ODER FOLGESCHÄDEN " -"JEGLICHER ART, EINSCHLIEßLICH UND OHNE EINSCHRÄNKUNGEN SCHÄDEN DURCH VERLUST " -"VON KULANZ, ARBEITSAUSFALL, COMPUTERVERSAGEN ODER COMPUTERFEHLFUNKTIONEN " -"ODER ALLE ANDEREN SCHÄDEN ODER VERLUSTE, DIE SICH AUS ODER IN VERBINDUNG MIT " -"DER VERWENDUNG DES DOKUMENTS UND VERÄNDERTER FASSUNGEN DES DOKUMENTS " -"ERGEBEN, AUCH WENN DIE OBEN GENANNTEN PARTEIEN ÜBER DIE MÖGLICHKEIT SOLCHER " -"SCHÄDEN INFORMIERT WAREN." +"FÜR DIREKTE, INDIREKTE, SPEZIELLE, VERSEHENTLICHE ODER FOLGESCHÄDEN JEGLICHER " +"ART, EINSCHLIEßLICH UND OHNE EINSCHRÄNKUNGEN SCHÄDEN DURCH VERLUST VON " +"KULANZ, ARBEITSAUSFALL, COMPUTERVERSAGEN ODER COMPUTERFEHLFUNKTIONEN ODER " +"ALLE ANDEREN SCHÄDEN ODER VERLUSTE, DIE SICH AUS ODER IN VERBINDUNG MIT DER " +"VERWENDUNG DES DOKUMENTS UND VERÄNDERTER FASSUNGEN DES DOKUMENTS ERGEBEN, " +"AUCH WENN DIE OBEN GENANNTEN PARTEIEN ÜBER DIE MÖGLICHKEIT SOLCHER SCHÄDEN " +"INFORMIERT WAREN." #: C/vinagre.xml:28(para) msgid "" @@ -150,8 +190,8 @@ "" msgstr "" "DAS DOKUMENT UND VERÄNDERTE FASSUNGEN DES DOKUMENTS WERDEN UNTER DEN " -"BEDINGUNGEN DER GNU FREE DOCUMENTATION LICENSE ZUR VERFÜGUNG GESTELLT MIT " -"DEM WEITERGEHENDEN VERSTÄNDNIS, DASS: " +"BEDINGUNGEN DER GNU FREE DOCUMENTATION LICENSE ZUR VERFÜGUNG GESTELLT MIT DEM " +"WEITERGEHENDEN VERSTÄNDNIS, DASS: " #: C/vinagre.xml:59(firstname) msgid "Vinicius" @@ -165,117 +205,151 @@ msgid "vdepizzol@gmail.com" msgstr "vdepizzol@gmail.com" -#: C/vinagre.xml:80(revnumber) +#: C/vinagre.xml:65(firstname) +msgid "Jonh" +msgstr "Jonh" + +#: C/vinagre.xml:66(surname) +msgid "Wendell" +msgstr "Wendell" + +#: C/vinagre.xml:67(email) +msgid "wendell@bani.com.br" +msgstr "wendell@bani.com.br" + +#: C/vinagre.xml:86(revnumber) +msgid "0.3" +msgstr "0.3" + +#: C/vinagre.xml:87(date) +msgid "2009-08-23" +msgstr "23. August 2009" + +#: C/vinagre.xml:89(para) +msgid "Jonh Wendell wendell@bani.com.br" +msgstr "Jonh Wendell wendell@bani.com.br" + +#: C/vinagre.xml:95(revnumber) msgid "0.2" msgstr "0.2" -#: C/vinagre.xml:81(date) +#: C/vinagre.xml:96(date) msgid "2008-01-15" msgstr "15. Januar 2008" -#: C/vinagre.xml:83(para) +#: C/vinagre.xml:98(para) msgid "Vinicius Depizzol vdepizzol@gmail.com" msgstr "Vinicius Depizzol vdepizzol@gmail.com" -#: C/vinagre.xml:89(revnumber) +#: C/vinagre.xml:104(revnumber) msgid "0.1" msgstr "0.1" -#: C/vinagre.xml:90(date) +#: C/vinagre.xml:105(date) msgid "2007-12-16" msgstr "16. Dezember 2007" -#: C/vinagre.xml:92(para) +#: C/vinagre.xml:107(para) msgid "Jaap A. Haitsma jaap@haitsma.org" msgstr "Jaap A. Haitsma jaap@haitsma.org" -#: C/vinagre.xml:95(para) +#: C/vinagre.xml:110(para) msgid "Jaap A. Haitsma" msgstr "Jaap A. Haitsma" -#: C/vinagre.xml:101(title) +#: C/vinagre.xml:116(title) msgid "Feedback" msgstr "Rückmeldungen" -#: C/vinagre.xml:102(para) +#: C/vinagre.xml:117(para) msgid "" "To report a bug or make a suggestion regarding the Vinagre application or " -"this manual, follow the directions in the Vinagre Contact " -"Page." -msgstr "" -"Um einen Fehler zu melden oder einen Vorschlag zur Anwendung Vinagre oder zu " -"diesem Handbuch zu machen, folgen Sie den Anweisungen auf der Vinagre-Kontakt-Website." +"this manual, please file a bug at GNOME bugzilla page." +msgstr "" +"Um einen Fehler zu melden oder einen Vorschlag zu dieser Anwendung oder " +"diesem Handbuch zu machen, können Sie eine Meldung auf unserer Fehlererfassungs-Website hinterlassen." #: C/vinagre.xml:0(application) msgid "Vinagre" msgstr "Vinagre" -#: C/vinagre.xml:116(primary) +#: C/vinagre.xml:131(primary) msgid "remote desktop" msgstr "Entfernter Desktop" -#: C/vinagre.xml:122(title) +#: C/vinagre.xml:137(title) msgid "Introduction" msgstr "Einführung" -#: C/vinagre.xml:128(secondary) +#: C/vinagre.xml:143(secondary) msgid "Manual" msgstr "Handbuch" -#: C/vinagre.xml:129(tertiary) +#: C/vinagre.xml:144(tertiary) msgid "vinagre" msgstr "vinagre" -#: C/vinagre.xml:132(para) +#: C/vinagre.xml:147(para) msgid "" "The Vinagre application is a Remote Desktop Viewer for the GNOME " -"desktop that uses Virtual Network Computing (VNC) system to " -"remotely control another computer." +"desktop that uses Virtual Network Computing (VNC) system (and " +"possibly other protocols) to remotely control another computer." msgstr "" -"Die anwendung Vinagre ist ein Betrachter für entfernte Desktops für den " -"GNOME-Desktop, der »Virtual Network Computing« (VNC) " -"verwendet, um einen anderen entfernten Rechner zu steuern." +"Die Anwendung Vinagre ist ein Betrachter für entfernte Desktops für die " +"GNOME-Arbeitsumgebung, der »Virtual Network " +"Computing« (VNC) und eventuell auch andere Protokolle verwendet, um einen " +"anderen entfernten Rechner zu steuern." -#: C/vinagre.xml:133(para) +#: C/vinagre.xml:148(para) msgid "Vinagre provides the following features:" msgstr "" "Vinagre verfügt über die folgenden " "Leistungsmerkmale:" -#: C/vinagre.xml:136(para) +#: C/vinagre.xml:151(para) msgid "Connect to several machines at the same time." msgstr "Gleichzeitige Verbindung zu verschiedenen Maschinen." -#: C/vinagre.xml:139(para) +#: C/vinagre.xml:154(para) msgid "Store recently connections and allows to bookmark them." msgstr "" "Speichern bereits benutzter Verbindungen, und deren Ablegen als Lesezeichen." -#: C/vinagre.xml:142(para) -msgid "Browse local network for VNC Servers." -msgstr "Durchsuchen des lokalen Netzwerks nach VNC-Servern." +#: C/vinagre.xml:157(para) +msgid "Browse local network for machines." +msgstr "Durchsuchen des lokalen Netzwerks nach Rechnern." + +#: C/vinagre.xml:160(para) +msgid "Provide a GNOME Panel applet to quickly access your bookmarked machines." +msgstr "" +"Bereitstellung eines Panel-Applets für GNOME, welches den schnellen Zugriff " +"auf die als Lesezeichen gespeicherten Rechner erlaubt." + +#: C/vinagre.xml:163(para) +msgid "Extensible through its plugin structure." +msgstr "Erweiterbarkeit durch seine Plugin-Struktur." -#: C/vinagre.xml:150(title) +#: C/vinagre.xml:171(title) msgid "Getting Started" msgstr "Erste Schritte" -#: C/vinagre.xml:155(title) +#: C/vinagre.xml:176(title) msgid "Starting Vinagre" msgstr "Vinagre starten" -#: C/vinagre.xml:156(para) +#: C/vinagre.xml:177(para) msgid "You can start Vinagre in the following ways:" msgstr "" "Sie können Vinagre auf folgende Arten starten:" -#: C/vinagre.xml:159(term) +#: C/vinagre.xml:180(term) msgid "Applications menu" msgstr "Menü Anwendungen" -#: C/vinagre.xml:161(para) +#: C/vinagre.xml:182(para) msgid "" "Choose InternetRemote " "Desktop Viewer." @@ -284,38 +358,74 @@ "guisubmenu>Betrachter für entfernte Desktops." -#: C/vinagre.xml:165(term) +#: C/vinagre.xml:186(term) msgid "Command line" msgstr "Befehlszeile" -#: C/vinagre.xml:167(para) +#: C/vinagre.xml:188(para) msgid "Execute the following command: vinagre" msgstr "Führen Sie den folgenden Befehl aus: vinagre" -#: C/vinagre.xml:174(title) +#: C/vinagre.xml:196(title) +msgid "Starting Vinagre from a command line" +msgstr "Vinagre in einer Befehlszeile starten" + +#: C/vinagre.xml:197(para) +msgid "" +"You can run Vinagre from a command line and " +"connect to a single machine or multiple machines. To connect to a machine " +"from a command line, type the following command, then press Return:" +msgstr "" +"Sie können Vinagre in einer Befehlszeile starten " +"und Verbindungen zu einem einzelnen oder zu mehreren Rechnern herstellen. Um " +"eine Verbindung zu einem Rechner in einer Befehlszeile herzustellen, geben " +"Sie folgenden Befehl ein und drücken Sie die Eingabetaste:" + +#: C/vinagre.xml:198(replaceable) +msgid "hostname_or_ip_address" +msgstr "Rechnername_oder_IP_Adresse" + +#: C/vinagre.xml:198(command) +msgid "vinagre " +msgstr "vinagre " + +#: C/vinagre.xml:199(para) +msgid "" +"For more information on how to run Vinagre from a " +"command line, see the unix manual page for Vinagre, Vinagre1." +msgstr "" +"Schauen Sie in die UNIX-Handbuchseite1 von " +"Vinagre, um weitere Informationen über das Starten " +"von Vinagre in einer Befehlszeile zu erhalten." + +#: C/vinagre.xml:206(title) msgid "The Vinagre Window" msgstr "Das Vinagre-Fenster" -#: C/vinagre.xml:176(title) +#: C/vinagre.xml:208(title) msgid "Vinagre window" msgstr "Vinagre-Fenster" -#: C/vinagre.xml:182(phrase) +#: C/vinagre.xml:214(phrase) msgid "Shows vinagre main window." msgstr "Zeigt das Vinagre-Hauptfenster an." -#: C/vinagre.xml:188(para) +#: C/vinagre.xml:220(para) msgid "" -"The Vinagre window contains the following " -"elements:" +"The Vinagre window contains the following elements:" msgstr "" "Das Vinagre-Fenster enthält folgende Elemente:" -#: C/vinagre.xml:193(term) +#: C/vinagre.xml:225(term) msgid "Menubar" msgstr "Menüleiste" -#: C/vinagre.xml:195(para) +#: C/vinagre.xml:227(para) msgid "" "The menus on the menubar contain all of the commands you need to work with " "remote connections in Vinagre." @@ -323,11 +433,11 @@ "Die Menüs in der Menüleiste enthalten alle Befehle, die Sie für die Arbeit " "mit entfernten Verbindungen in Vinagre benötigen." -#: C/vinagre.xml:199(term) +#: C/vinagre.xml:231(term) msgid "Toolbar" msgstr "Werkzeugleiste" -#: C/vinagre.xml:201(para) +#: C/vinagre.xml:233(para) msgid "" "The toolbar contains a subset of the most used commands that you can access " "from the menubar." @@ -335,11 +445,11 @@ "Die Werkzeugleiste enthält eine Auswahl der am meisten genutzten Befehle, " "welche Sie über die Menüleiste erreichen können." -#: C/vinagre.xml:205(term) +#: C/vinagre.xml:237(term) msgid "Display Area" msgstr "Anzeigebereich" -#: C/vinagre.xml:207(para) +#: C/vinagre.xml:239(para) msgid "" "The display area contains a list of tabs with the connected machines and its " "remote desktops." @@ -347,11 +457,11 @@ "Der Anzeigebereich enthält eine Liste von Reitern, welche die verbundenen " "Maschinen und deren entfernte Desktops darstellen." -#: C/vinagre.xml:211(term) +#: C/vinagre.xml:243(term) msgid "Statusbar" msgstr "Statusleiste" -#: C/vinagre.xml:213(para) +#: C/vinagre.xml:245(para) msgid "" "The statusbar displays information about current Vinagre activity and contextual information about the menu items." @@ -360,77 +470,165 @@ "Vinagre-Aktivität und Kontextinformationen über " "die Menüpunkte angezeigt." -#: C/vinagre.xml:217(term) +#: C/vinagre.xml:249(term) msgid "Side Pane" msgstr "Seitenleiste" -#: C/vinagre.xml:219(para) -msgid "The side pane contains a list of bookmarked connections." +#: C/vinagre.xml:251(para) +msgid "" +"The side pane contains a list of bookmarked connections and (if available) a " +"list of auto-discovered network machines." msgstr "" "Die Seitenleiste enthält eine Liste der als Lesezeichen gespeicherten " -"Verbindungen." +"Verbindungen sowie eine Liste der automatisch ermittelten Netzwerkrechner, " +"falls welche verfügbar sind." -#: C/vinagre.xml:228(title) +#: C/vinagre.xml:259(title) +msgid "Some notes about Vinagre" +msgstr "Einige Hinweise zu Vinagre" + +#: C/vinagre.xml:260(para) +msgid "" +"As a tool to access other machines, Vinagre behaves slightly different than " +"other GNOME applications in its default installation." +msgstr "" +"Wegen seiner Konzeption als ein Werkzeug zum Zugriff auf andere Rechner " +"verhält sich Vinagre in der Standardinstallation " +"etwas anders als andere GNOME-Anwendungen." + +#: C/vinagre.xml:261(para) +msgid "" +"Vinagre comes with menu accelerators and keyboard shortcuts disabled by " +"default. This avoids keys being intercepted by Vinagre when you wanted to " +"send those keys to the remote machine." +msgstr "" +"Vinagre verfügt über Menü-Zugriffstasten und " +"andere Tastenkürzel, die in der Vorgabeeinstellung deaktiviert sind. Dies " +"verhindert, dass Tastenbedienungen von Vinagre " +"akzeptiert werden, die eigentlich an den entfernten Rechner weitergeleitet " +"werden sollen." + +#: C/vinagre.xml:262(para) +msgid "" +"For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by " +"default." +msgstr "" +"Beispielsweise können Sie mit dem Tastenkürzel Strg+W " +"einen Reiter schleißen, aber per Vorgabe wird diese Tastenkombination an den " +"entfernten Rechner weitergeleitet." + +#: C/vinagre.xml:263(para) +msgid "" +"If you want to change this behavior, go to Vinagre preferences in " +"EditPreferences." +msgstr "" +"Falls Sie dieses Verhalten ändern wollen, öffnen Sie die Einstellungen von " +"Vinagre mittels BearbeitenEinstellungen." + +#: C/vinagre.xml:275(title) msgid "Using Vinagre" msgstr "Vinagre benutzen" -#: C/vinagre.xml:231(title) -msgid "To connect with a remote machine" +#: C/vinagre.xml:278(title) +msgid "To connect to a remote machine" msgstr "Verbinden mit einem entfernten Rechner" -#: C/vinagre.xml:234(title) -msgid "Informing Host address" +#: C/vinagre.xml:281(title) +msgid "Informing a host address" msgstr "Eingabe der Rechneradresse" -#: C/vinagre.xml:235(para) +#: C/vinagre.xml:282(para) msgid "" "To connect with a remote machine, choose " "CtrlNMachineConnect. The Connection Dialog is " -"displayed. Inform the Host and the PortProtocol and the Host of the connection and click the Connect " -"button. You can also use the Find button to browse " -"available machines on local network." +"button. You will see a bunch of options depending on what protocol you have " +"selected." msgstr "" "Um Ihren Rechner mit einer entfernten Maschine zu verbinden, wählen Sie " "StrgNMaschineVerbinden. Der Verbindungsdialog wird " -"geöffnet. Geben Sie Rechner und Port ein und klicken anschließend auf den Knopf Verbinden. Sie können auch den Knopf Suchen " -"verwenden, um nach verfügbaren Maschinen in Ihrem lokalen Netzwerk zu suchen." - -#: C/vinagre.xml:246(para) -msgid "" -"Some machines may require a secure connection. In this case, a " -"Password dialog will be displayed asking for the " -"connection password. If you check Remember this passwordProtokoll und den " +"Rechner ein und klicken anschließend auf den Knopf " +"Verbinden. Abhängig vom gewählten Protokoll wird eine " +"Reihe von Optionen angezeigt." + +#: C/vinagre.xml:294(title) +msgid "Connect dialog" +msgstr "Verbindungsdialog" + +#: C/vinagre.xml:300(phrase) +msgid "Shows the connect dialog." +msgstr "Zeigt den Verbindungsdialog." + +#: C/vinagre.xml:306(para) +msgid "" +"You can also use the Find button to browse available " +"machines on local network." +msgstr "" +"Mit dem Knopf Suchen können Sie das lokale Netzwerk " +"nach verfügbaren Rechnern durchsuchen." + +#: C/vinagre.xml:310(para) +msgid "" +"The availabity of the Find button depends on the " +"protocol you have selected. Vinagre relies on Avahi service to browse for machines in your local network. Also, " +"notice that Vinagre can be compiled without Avahi " +"support. In this case, this button will not be available." +msgstr "" +"Es hängt vom gewählten Protokoll ab, ob der Knopf Suchen angezeigt wird oder nicht. Vinagre " +"benötigt den Avahi-Dienst zum Durchsuchen des " +"lokalen Netzwerks. Möglicherweise könnte Vinagre " +"ohne Unterstützung für Avahi erstellt worden sein. " +"In diesem Fall wird dieser Knopf nicht verfügbar sein." + +#: C/vinagre.xml:318(para) +msgid "" +"Some machines may require a secure connection. In this case, an " +"Authentication dialog will be displayed asking for the " +"credentials. The type of credentials depends on the server. It may be a " +"password and an username. If you check Remember this credential, Vinagre will store the secure " "information using GNOME Keyring Manager." msgstr "" "Einige Maschinen erfordern eine sichere Verbindung. In diesem Fall wird ein " -"Passwort-Dialog geöffnet, der Sie um die Eingabe des " -"Passworts für die Verbindung bittet. Wenn Sie das Feld An dieses " -"Passwort erinnern aktivieren, speichert Vinagre diese Information " -"in der GNOME-Schlüsselbundverwaltung." +"Legitimierungs-Dialog geöffnet, der Sie um die Eingabe " +"der Legitimationsdaten für die Verbindung bittet. Wenn Sie das Feld " +"Legitimation merken aktivieren, speichert Vinagre diese " +"Information in der GNOME-Schlüsselbundverwaltung." + +#: C/vinagre.xml:326(title) +msgid "Authentication dialog" +msgstr "Legitimierungsdialog" + +#: C/vinagre.xml:332(phrase) +msgid "Shows the authentication dialog." +msgstr "Zeigt den Legitimierungsdialog." -#: C/vinagre.xml:253(para) +#: C/vinagre.xml:337(para) msgid "" "If the connection has been used previously, you can also access it by " "MachineRecent connections...." msgstr "" -"Falls die Verbindung vorher bereits einmal genutzt wurde, erreichen Sie " -"diese auch über MaschineZuletzt " -"geöffnete Verbindungen." +"Falls die Verbindung vorher bereits einmal genutzt wurde, erreichen Sie diese " +"auch über MaschineZuletzt geöffnete " +"Verbindungen." -#: C/vinagre.xml:263(title) +#: C/vinagre.xml:347(title) msgid "Opening a Remote Connection File" msgstr "Öffnen einer Datei über eine entfernte Verbindung" -#: C/vinagre.xml:264(para) +#: C/vinagre.xml:348(para) msgid "" "Some hosts distribute remote connection files (generally ending with suffix " "\".vnc\") instead of inform Host address and Port. To open a remote " @@ -442,15 +640,15 @@ msgstr "" "Einige Rechner stellen Dateien für entfernte Verbindungen bereit (deren " "Dateinamen im Allgemeinen auf ».vnc« enden), die Sie anstelle der Eingabe von " -"Rechneradresse und Portnummer verwenden können. Um eine solche Datei für " -"eine entfernte Verbindung zu öffnen, wählen Sie " +"Rechneradresse und Portnummer verwenden können. Um eine solche Datei für eine " +"entfernte Verbindung zu öffnen, wählen Sie " "StrgOMaschineÖffnen. Der Dialog Datei auswählen " "wird angezeigt. Wählen Sie die Datei aus, welche Sie öffnen wollen, und " "klicken Sie anschließend auf den Knopf Öffnen." -#: C/vinagre.xml:276(para) +#: C/vinagre.xml:360(para) msgid "" "You can also double-click on a remote connection file in the " "Nautilus file manager to open it on the " @@ -460,78 +658,51 @@ "Nautilus-Dateimanager doppelklicken, um diese im " "Vinagre-Fenster zu öffnen." -#: C/vinagre.xml:284(title) -msgid "To Create a New Bookmark" -msgstr "Erzeugen eines neuen Lesezeichens" - -#: C/vinagre.xml:285(para) -msgid "" -"To bookmark the currently viewed connection, choose " -"CtrlDBookmarksAdd to " -"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and click " -"Ok." -msgstr "" -"Um die gegenwärtig angezeigte Verbindung als Lesezeichen zu speichern, " -"wählen Sie menuchoice>StrgDLesezeichenLesezeichen hinzufügen. Der " -"Dialog Lesezeichen hinzufügen wird angezeigt. Geben Sie " -"einen Namen für die Verbindung ein und klicken Sie anschließend auf " -"OK." - -#: C/vinagre.xml:296(title) -msgid "To Remove a Bookmark" -msgstr "Entfernen eines Lesezeichens" - -#: C/vinagre.xml:297(para) -msgid "" -"To remove a bookmark, choose Remove from the " -"context menu of the bookmark in the Side Pane." -msgstr "" -"Um ein Lesezeichen zu entfernen, wählen Sie Lesezeichen " -"entfernen aus dem Kontextmenü des Lesezeichens in der " -"Seitenleiste." - -#: C/vinagre.xml:304(title) -msgid "To Edit a Bookmark's Properties" -msgstr "Ändern der Eigenschaften eines Lesezeichens" +#: C/vinagre.xml:367(title) C/vinagre.xml:419(title) C/vinagre.xml:422(title) +msgid "Using Bookmarks" +msgstr "Verwendung von Lesezeichen" -#: C/vinagre.xml:305(para) +#: C/vinagre.xml:368(para) msgid "" -"To edit a bookmark's properties, such as it's name and host, choose " -"Edit from the context menu of the bookmark in the " -"Side Pane." +"You can access your mostly used connections through bookmarks. See the Bookmarks chapter." msgstr "" -"Um die Eigenschaften eines Lesezeichens zu bearbeiten, wie beispielsweise " -"dessen Namen und den dazugehörigen Rechner, wählen Sie " -"Bearbeiten aus dem Kontextmenü des Lesezeichens " -"in der Seitenleiste." +"Über Lesezeichen können Sie auf häufig verwendete Verbindungen zugreifen. " +"Weitere Informationen finden Sie im abschnitt " +"Lesezeichen." -#: C/vinagre.xml:312(title) +#: C/vinagre.xml:376(title) msgid "To Use Full Screen Mode" msgstr "Verwendung des Vollbildmodus" -#: C/vinagre.xml:313(para) +#: C/vinagre.xml:377(para) msgid "" "To zoom the Display Area to full screen mode, choose " "F11ViewFull Screen. To exit full " -"screen mode, press F11 or CtrlAlt." +"guimenu>Full Screen or the " +"corresponding tool bar button." msgstr "" "Um den Anzeigebereich auf die Größe Ihres Bildschirms zu vergrößern, wählen " "Sie F11AnsichtVollbild. Um den " -"Vollbildmodus wieder zu verlassen, drücken Sie F11 oder " -"StrgAlt." +"guimenu>Vollbild oder klicken auf den " +"entsprechenden Knopf in der Werkzeugleiste." -#: C/vinagre.xml:324(title) +#: C/vinagre.xml:385(para) +msgid "" +"While in full screen mode, move the mouse to the top center of the screen to " +"show a hidden tool bar, which has buttons to leave full screen mode, close " +"the connection and other options." +msgstr "" +"Bewegen Sie im Vollbildmodus die Maus zur oberen Mitte des Bildschirms, um " +"die verborgene Werkzeugleiste einzublenden. Diese enthält Knöpfe zum " +"Verlassen des Vollbildmodus, zum Schließen der Verbindung und weitere " +"Optionen." + +#: C/vinagre.xml:394(title) msgid "To Close a Connection" msgstr "Schließen einer Verbindung" -#: C/vinagre.xml:325(para) +#: C/vinagre.xml:395(para) msgid "" "To close a connection, choose MachineClose." @@ -539,11 +710,11 @@ "Um eine Verbindung zu schließen, wählen Sie MaschineSchließen." -#: C/vinagre.xml:334(title) +#: C/vinagre.xml:404(title) msgid "To Take Screenshot" msgstr "Erstellen eines Bildschirmfotos" -#: C/vinagre.xml:335(para) +#: C/vinagre.xml:405(para) msgid "" "To take screenshot of the current remote desktop, choose " "MachineTake ScreenshotMaschineBildschirmfoto aufnehmen oder " -"klicken auf den entsprechenden Knopf in der Werkzeugleiste. Der Dialog " +"guimenu>Bildschirmfoto aufnehmen oder klicken " +"auf den entsprechenden Knopf in der Werkzeugleiste. Der Dialog " "Bildschirmfoto speichern wird angezeigt, in welchem " "Sie das Bildschirmfoto speichern können." -#: C/vinagre.xml:349(title) +#: C/vinagre.xml:423(para) +msgid "" +"Bookmarks are a resource to keep around machines you access frequently. They " +"are visible at side panel or in the Bookmarks menu." +msgstr "" +"Lesezeichen stellen eine Möglichkeit dar, den Zugriff auf häufig verwendete " +"Rechner zu erleichtern. Die Lesezeichen sind in der Seitenleiste oder im Menü " +"Lesezeichen verfügbar." + +#: C/vinagre.xml:428(title) +msgid "Bookmarks at side panel" +msgstr "Lesezeichen in der Seitenleiste" + +#: C/vinagre.xml:434(phrase) +msgid "Shows bookmarks at side panel." +msgstr "Zeigt Lesezeichen in der Seitenleiste." + +#: C/vinagre.xml:440(para) +msgid "" +"As you move the mouse around the entries, a tooltip will show you the " +"hostname of the connection. To connect to a machine, just double click on a " +"entry." +msgstr "" +"Wenn Sie die Maus über den Einträgen bewegen, wird eine Minihilfe mit dem " +"Rechnernamen der Verbindung angezeigt." + +#: C/vinagre.xml:447(title) +msgid "To Create a New Bookmark" +msgstr "Erzeugen eines neuen Lesezeichens" + +#: C/vinagre.xml:448(para) +msgid "" +"To bookmark the currently viewed connection, choose " +"CtrlDBookmarksAdd to " +"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and " +"optionally other data, such as the folder and click Save." +msgstr "" +"Um die gegenwärtig angezeigte Verbindung als Lesezeichen zu speichern, wählen " +"Sie StrgDLesezeichenLesezeichen " +"hinzufügen. Der Dialog Lesezeichen " +"hinzufügen wird angezeigt. Geben Sie einen Namen für die " +"Verbindung ein und klicken Sie anschließend auf Speichern." + +#: C/vinagre.xml:458(title) +msgid "Saving a bookmark" +msgstr "Speichern eines Lesezeichens" + +#: C/vinagre.xml:464(phrase) +msgid "Shows the Saving to Bookmarks dialog." +msgstr "Zeigt den Dialog zum Speichern von Lesezeichen." + +#: C/vinagre.xml:471(para) +msgid "" +"You can use folders to organize your bookmarks. To create a folder, right " +"click in the side panel and choose the option New Folder " +"in the context menu, or go to menu BookmarksNew Folder." +msgstr "" +"Sie können Ordner zum Organisieren Ihrer Lesezeichen verwenden. Um einen " +"Ordner anzulegen, klicken sie mit der rechten Maustaste in die Seitenleiste " +"und wählen die Option Neuer Ordner im Kontextmenü. " +"Alternativ verwenden Sie hierzu das Menü LesezeichenNeuer Ordner." + +#: C/vinagre.xml:484(title) +msgid "To Edit a Bookmark's Properties" +msgstr "Ändern der Eigenschaften eines Lesezeichens" + +#: C/vinagre.xml:485(para) +msgid "" +"To edit a bookmark's properties, such as it's name and host, choose " +"Edit bookmark from the context menu of the " +"bookmark in the Side Pane. The same dialog as shown above will be displayed." +msgstr "" +"Um die Eigenschaften eines Lesezeichens zu bearbeiten, wie beispielsweise " +"dessen Namen und den dazugehörigen Rechner, wählen Sie " +"Lesezeichen bearbeiten aus dem Kontextmenü des " +"Lesezeichens in der Seitenleiste. Der gleiche Dialog wie oben dargestellt " +"wird angezeigt." + +#: C/vinagre.xml:491(title) +msgid "Editing a bookmark" +msgstr "Bearbeiten eines Lesezeichens" + +#: C/vinagre.xml:497(phrase) +msgid "Context menu option to edit a bookmark" +msgstr "Option im Kontextmenü zum Bearbeiten eines Lesezeichens" + +#: C/vinagre.xml:503(para) +msgid "You can also edit a folder." +msgstr "Sie können auch einen Ordner bearbeiten." + +#: C/vinagre.xml:507(title) +msgid "To Remove a Bookmark" +msgstr "Entfernen eines Lesezeichens" + +#: C/vinagre.xml:508(para) +msgid "" +"To remove a bookmark, choose Remove from bookmarks from " +"the context menu of the bookmark in the Side Pane." +msgstr "" +"Um ein Lesezeichen zu entfernen, wählen Sie Lesezeichen entfernen aus dem Kontextmenü des Lesezeichens in der Seitenleiste." + +#: C/vinagre.xml:512(para) +msgid "" +"You can also remove a folder. Notice that removing a folder will remove all " +"its entries. A confirmation dialog will be shown." +msgstr "" +"Sie können auch einen Ordner löschen. Beachten Sie, dass beim Löschen eines " +"Ordners auch dessen sämtliche Einträge gelöscht werden. Ein " +"Bestätigungsdialog wird angezeigt." + +#: C/vinagre.xml:518(title) +msgid "Preferences" +msgstr "Einstellungen" + +#: C/vinagre.xml:519(para) +msgid "" +"To configure Vinagre, choose " +"EditPreferences. The Preferences dialog contains the " +"following items:" +msgstr "" +"Um die Einstellungen von Vinagre zu ändern, wählen " +"Sie BearbeitenEinstellungen. Der Dialog Einstellungen " +"enthält die folgenden Elemente:" + +#: C/vinagre.xml:523(guilabel) +msgid "Always show tabs" +msgstr "Reiter immer anzeigen" + +#: C/vinagre.xml:525(para) +msgid "" +"Select this option to make the tabs always visible, even when only one " +"connection is active." +msgstr "" +"Wählen Sie diese Option, um Reiter immer anzuzeigen, selbst wenn nur eine " +"Verbindung aktiv sein sollte." + +#: C/vinagre.xml:530(guilabel) +msgid "Show menu shortcuts" +msgstr "Menütastenkombinationen anzeigen" + +#: C/vinagre.xml:532(para) +msgid "" +"By selecting this option, keyboard shortcuts, like Ctrl+D and menu accelerators, like Alt+M to access " +"the Machine menu, will be enabled. This means that Vinagre will catch those " +"key combinations, instead of sending them to the remote machine. Because most " +"of the time you will be working on the remote machine, this option comes " +"disabled by default." +msgstr "" +"Wenn Sie diese Option wählen, werden Tastenkürzel wie Strg+D und Menü-Zugriffstasten wie Alt+M aktiviert, " +"die normalerweise dem Zugriff auf das Menü des entfernten Rechners dienen. " +"Das bedeutet, dass Vinagre diese " +"Tastenkombinationen abfängt, anstelle sie an den entfernten Rechner " +"weiterzuleiten. Meist werden Sie jedoch auf dem entfernten Rechner arbeiten " +"wollen, daher ist diese Option per Vorgabe deaktiviert." + +#: C/vinagre.xml:543(title) msgid "About" msgstr "Über Vinagre" -#: C/vinagre.xml:350(para) +#: C/vinagre.xml:544(para) msgid "" "Vinagre was written by Jonh Wendell wendell@bani.com.br. To " "find more information about Vinagre, please visit the VinagreVinagre web page." msgstr "" "Vinagre wurde von Jonh Wendell wendell@bani.com.br " -"geschrieben. Weitere Informationen über Vinagre finden Sie auf der Vinagre-Website." +"geschrieben. Weitere Informationen über Vinagre finden Sie auf der Vinagre-Website." -#: C/vinagre.xml:356(para) +#: C/vinagre.xml:549(para) msgid "" "To report a bug or make a suggestion regarding this application you can file " -"a bug in our bug tracker." +"a bug in our bug tracker." msgstr "" "Um einen Fehler zu melden oder einen Vorschlag zu dieser Anwendung oder " "diesem Handbuch zu machen, können Sie eine Meldung auf unserer Bugtracker-Website hinterlassen." -#: C/vinagre.xml:362(para) +#: C/vinagre.xml:555(para) msgid "" -"This program is distributed 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. A copy of this license " -"can be found at the GNU site, or in the file COPYING included with the source " -"code of this program." +"This program is distributed 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. A copy of this license can be " +"found at the GNU site, or in the file COPYING included with the source code of " +"this program." msgstr "" "Das vorliegende Programm unterliegt den Bedingungen der GNU General Public " "License (GPL), Version 2 oder jeder späteren, von der Free Software " "Foundation veröffentlichten Version. Ein Kopie der GPL finden Sie auf der " "GNU-" -"Website, oder in der dem Quelltext diese Programms beiliegenden " -"Datei COPYING." +"Website, oder in der dem Quelltext diese Programms beiliegenden Datei " +"COPYING." #. Put one translator per line, in the form of NAME , YEAR1, YEAR2. #: C/vinagre.xml:0(None) msgid "translator-credits" -msgstr "Mario Blättermann , 2008" +msgstr "Mario Blättermann , 2008, 2009" diff -Nru vinagre-2.26.1/help/de/vinagre.xml vinagre-2.29.1/help/de/vinagre.xml --- vinagre-2.26.1/help/de/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/de/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +145,7 @@ vinagre - Die anwendung Vinagre ist ein Betrachter für entfernte Desktops für den GNOME-Desktop, der »Virtual Network Computing« (VNC) verwendet, um einen anderen entfernten Rechner zu steuern. + Die Anwendung Vinagre ist ein Betrachter für entfernte Desktops für die GNOME-Arbeitsumgebung, der »Virtual Network Computing« (VNC) und eventuell auch andere Protokolle verwendet, um einen anderen entfernten Rechner zu steuern. Vinagre verfügt über die folgenden Leistungsmerkmale: @@ -142,7 +155,13 @@ Speichern bereits benutzter Verbindungen, und deren Ablegen als Lesezeichen. - Durchsuchen des lokalen Netzwerks nach VNC-Servern. + Durchsuchen des lokalen Netzwerks nach Rechnern. + + + Bereitstellung eines Panel-Applets für GNOME, welches den schnellen Zugriff auf die als Lesezeichen gespeicherten Rechner erlaubt. + + + Erweiterbarkeit durch seine Plugin-Struktur. @@ -154,7 +173,7 @@ -
+
Vinagre starten Sie können Vinagre auf folgende Arten starten: @@ -172,8 +191,19 @@
- -
+ + +
+ Vinagre in einer Befehlszeile starten + Sie können Vinagre in einer Befehlszeile starten und Verbindungen zu einem einzelnen oder zu mehreren Rechnern herstellen. Um eine Verbindung zu einem Rechner in einer Befehlszeile herzustellen, geben Sie folgenden Befehl ein und drücken Sie die Eingabetaste: + vinagre Rechnername_oder_IP_Adresse + Schauen Sie in die UNIX-Handbuchseite1 von Vinagre, um weitere Informationen über das Starten von Vinagre in einer Befehlszeile zu erhalten. +
+ + + + +
Das Vinagre-Fenster
Vinagre-Fenster @@ -218,12 +248,21 @@ Seitenleiste - Die Seitenleiste enthält eine Liste der als Lesezeichen gespeicherten Verbindungen. + Die Seitenleiste enthält eine Liste der als Lesezeichen gespeicherten Verbindungen sowie eine Liste der automatisch ermittelten Netzwerkrechner, falls welche verfügbar sind.
+ +
+ Einige Hinweise zu Vinagre + Wegen seiner Konzeption als ein Werkzeug zum Zugriff auf andere Rechner verhält sich Vinagre in der Standardinstallation etwas anders als andere GNOME-Anwendungen. + Vinagre verfügt über Menü-Zugriffstasten und andere Tastenkürzel, die in der Vorgabeeinstellung deaktiviert sind. Dies verhindert, dass Tastenbedienungen von Vinagre akzeptiert werden, die eigentlich an den entfernten Rechner weitergeleitet werden sollen. + Beispielsweise können Sie mit dem Tastenkürzel Strg+W einen Reiter schleißen, aber per Vorgabe wird diese Tastenkombination an den entfernten Rechner weitergeleitet. + Falls Sie dieses Verhalten ändern wollen, öffnen Sie die Einstellungen von Vinagre mittels BearbeitenEinstellungen. +
+
@@ -234,10 +273,39 @@
Eingabe der Rechneradresse - Um Ihren Rechner mit einer entfernten Maschine zu verbinden, wählen Sie StrgNMaschineVerbinden. Der Verbindungsdialog wird geöffnet. Geben Sie Rechner und Port ein und klicken anschließend auf den Knopf Verbinden. Sie können auch den Knopf Suchen verwenden, um nach verfügbaren Maschinen in Ihrem lokalen Netzwerk zu suchen. + Um Ihren Rechner mit einer entfernten Maschine zu verbinden, wählen Sie StrgNMaschineVerbinden. Der Verbindungsdialog wird geöffnet. Geben Sie das Protokoll und den Rechner ein und klicken anschließend auf den Knopf Verbinden. Abhängig vom gewählten Protokoll wird eine Reihe von Optionen angezeigt. + +
+ Verbindungsdialog + + + + + + Zeigt den Verbindungsdialog. + + + +
+ + Mit dem Knopf Suchen können Sie das lokale Netzwerk nach verfügbaren Rechnern durchsuchen. - Einige Maschinen erfordern eine sichere Verbindung. In diesem Fall wird ein Passwort-Dialog geöffnet, der Sie um die Eingabe des Passworts für die Verbindung bittet. Wenn Sie das Feld An dieses Passwort erinnern aktivieren, speichert Vinagre diese Information in der GNOME-Schlüsselbundverwaltung. + Es hängt vom gewählten Protokoll ab, ob der Knopf Suchen angezeigt wird oder nicht. Vinagre benötigt den Avahi-Dienst zum Durchsuchen des lokalen Netzwerks. Möglicherweise könnte Vinagre ohne Unterstützung für Avahi erstellt worden sein. In diesem Fall wird dieser Knopf nicht verfügbar sein. + + Einige Maschinen erfordern eine sichere Verbindung. In diesem Fall wird ein Legitimierungs-Dialog geöffnet, der Sie um die Eingabe der Legitimationsdaten für die Verbindung bittet. Wenn Sie das Feld Legitimation merken aktivieren, speichert Vinagre diese Information in der GNOME-Schlüsselbundverwaltung. +
+ Legitimierungsdialog + + + + + + Zeigt den Legitimierungsdialog. + + +
+ Falls die Verbindung vorher bereits einmal genutzt wurde, erreichen Sie diese auch über MaschineZuletzt geöffnete Verbindungen.
@@ -249,26 +317,20 @@ Sie können auch auf eine Datei einer entfernten Verbindung im Nautilus-Dateimanager doppelklicken, um diese im Vinagre-Fenster zu öffnen.
-
- -
- Erzeugen eines neuen Lesezeichens - Um die gegenwärtig angezeigte Verbindung als Lesezeichen zu speichern, wählen Sie menuchoice>StrgDLesezeichenLesezeichen hinzufügen -
- -
- Entfernen eines Lesezeichens - Um ein Lesezeichen zu entfernen, wählen Sie Lesezeichen entfernen aus dem Kontextmenü des Lesezeichens in der Seitenleiste. -
- -
- Ändern der Eigenschaften eines Lesezeichens - Um die Eigenschaften eines Lesezeichens zu bearbeiten, wie beispielsweise dessen Namen und den dazugehörigen Rechner, wählen Sie Bearbeiten aus dem Kontextmenü des Lesezeichens in der Seitenleiste. + +
+ Verwendung von Lesezeichen + Über Lesezeichen können Sie auf häufig verwendete Verbindungen zugreifen. Weitere Informationen finden Sie im abschnitt Lesezeichen. +
+
- Verwendung des Vollbildmodus - Um den Anzeigebereich auf die Größe Ihres Bildschirms zu vergrößern, wählen Sie F11AnsichtVollbild. Um den Vollbildmodus wieder zu verlassen, drücken Sie F11 oder StrgAlt. + Verwendung des Vollbildmodus + Um den Anzeigebereich auf die Größe Ihres Bildschirms zu vergrößern, wählen Sie F11AnsichtVollbild oder klicken auf den entsprechenden Knopf in der Werkzeugleiste. + + Bewegen Sie im Vollbildmodus die Maus zur oberen Mitte des Bildschirms, um die verborgene Werkzeugleiste einzublenden. Diese enthält Knöpfe zum Verlassen des Vollbildmodus, zum Schließen der Verbindung und weitere Optionen. +
@@ -284,9 +346,105 @@
+
+ Verwendung von Lesezeichen + +
+ Verwendung von Lesezeichen + Lesezeichen stellen eine Möglichkeit dar, den Zugriff auf häufig verwendete Rechner zu erleichtern. Die Lesezeichen sind in der Seitenleiste oder im Menü Lesezeichen verfügbar. + +
+ Lesezeichen in der Seitenleiste + + + + + + Zeigt Lesezeichen in der Seitenleiste. + + + +
+ + Wenn Sie die Maus über den Einträgen bewegen, wird eine Minihilfe mit dem Rechnernamen der Verbindung angezeigt. + +
+ +
+ Erzeugen eines neuen Lesezeichens + Um die gegenwärtig angezeigte Verbindung als Lesezeichen zu speichern, wählen Sie StrgDLesezeichenLesezeichen hinzufügen. Der Dialog Lesezeichen hinzufügen wird angezeigt. Geben Sie einen Namen für die Verbindung ein und klicken Sie anschließend auf Speichern. + +
+ Speichern eines Lesezeichens + + + + + + Zeigt den Dialog zum Speichern von Lesezeichen. + + + +
+ + + Sie können Ordner zum Organisieren Ihrer Lesezeichen verwenden. Um einen Ordner anzulegen, klicken sie mit der rechten Maustaste in die Seitenleiste und wählen die Option Neuer Ordner im Kontextmenü. Alternativ verwenden Sie hierzu das Menü LesezeichenNeuer Ordner. + + +
+ +
+ Ändern der Eigenschaften eines Lesezeichens + Um die Eigenschaften eines Lesezeichens zu bearbeiten, wie beispielsweise dessen Namen und den dazugehörigen Rechner, wählen Sie Lesezeichen bearbeiten aus dem Kontextmenü des Lesezeichens in der Seitenleiste. Der gleiche Dialog wie oben dargestellt wird angezeigt. + +
+ Bearbeiten eines Lesezeichens + + + + + + Option im Kontextmenü zum Bearbeiten eines Lesezeichens + + + +
+ + Sie können auch einen Ordner bearbeiten. +
+ +
+ Entfernen eines Lesezeichens + Um ein Lesezeichen zu entfernen, wählen Sie Lesezeichen entfernen aus dem Kontextmenü des Lesezeichens in der Seitenleiste. + Sie können auch einen Ordner löschen. Beachten Sie, dass beim Löschen eines Ordners auch dessen sämtliche Einträge gelöscht werden. Ein Bestätigungsdialog wird angezeigt. +
+ +
+ +
+ Einstellungen + Um die Einstellungen von Vinagre zu ändern, wählen Sie BearbeitenEinstellungen. Der Dialog Einstellungen enthält die folgenden Elemente: + + + + Reiter immer anzeigen + + Wählen Sie diese Option, um Reiter immer anzuzeigen, selbst wenn nur eine Verbindung aktiv sein sollte. + + + + + Menütastenkombinationen anzeigen + + Wenn Sie diese Option wählen, werden Tastenkürzel wie Strg+D und Menü-Zugriffstasten wie Alt+M aktiviert, die normalerweise dem Zugriff auf das Menü des entfernten Rechners dienen. Das bedeutet, dass Vinagre diese Tastenkombinationen abfängt, anstelle sie an den entfernten Rechner weiterzuleiten. Meist werden Sie jedoch auf dem entfernten Rechner arbeiten wollen, daher ist diese Option per Vorgabe deaktiviert. + + + +
+
Über Vinagre - Vinagre wurde von Jonh Wendell wendell@bani.com.br geschrieben. Weitere Informationen über Vinagre finden Sie auf der Vinagre-Website. + Vinagre wurde von Jonh Wendell wendell@bani.com.br geschrieben. Weitere Informationen über Vinagre finden Sie auf der Vinagre-Website. Um einen Fehler zu melden oder einen Vorschlag zu dieser Anwendung oder diesem Handbuch zu machen, können Sie eine Meldung auf unserer Bugtracker-Website hinterlassen. Das vorliegende Programm unterliegt den Bedingungen der GNU General Public License (GPL), Version 2 oder jeder späteren, von der Free Software Foundation veröffentlichten Version. Ein Kopie der GPL finden Sie auf der GNU-Website, oder in der dem Quelltext diese Programms beiliegenden Datei COPYING.
diff -Nru vinagre-2.26.1/help/el/el.po vinagre-2.29.1/help/el/el.po --- vinagre-2.26.1/help/el/el.po 2009-04-13 14:36:21.000000000 +0100 +++ vinagre-2.29.1/help/el/el.po 2009-10-26 13:44:11.000000000 +0000 @@ -1,26 +1,91 @@ # Greek translation of Vinagre Documentation # Copyright (C) 2008 - 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the vinagre package. +# Fotis Tsamis , 2009. +# Sterios Prosiniklis , 2009. msgid "" msgstr "" "Project-Id-Version: el\n" -"POT-Creation-Date: 2009-03-15 09:10+0000\n" -"PO-Revision-Date: 2009-03-15 19:34+0200\n" -"Last-Translator: Μάριος Ζηντίλης \n" +"POT-Creation-Date: 2009-09-21 12:46+0000\n" +"PO-Revision-Date: 2009-10-10 09:37+0300\n" +"Last-Translator: Sterios Prosiniklis \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. -#: C/vinagre.xml:180(None) +#: C/vinagre.xml:212(None) +#| msgid "" +#| "@@image: 'figures/vinagre-screenshot.png'; " +#| "md5=5ea2ba4ba469dadea877f19b6b33ced2" msgid "" "@@image: 'figures/vinagre-screenshot.png'; " -"md5=5ea2ba4ba469dadea877f19b6b33ced2" +"md5=dc88b591b3b8ed3a49335c5431806c13" msgstr "" "@@image: 'figures/vinagre-screenshot.png'; " -"md5=5ea2ba4ba469dadea877f19b6b33ced2" +"md5=dc88b591b3b8ed3a49335c5431806c13" + +#. 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/vinagre.xml:298(None) +msgid "" +"@@image: 'figures/vinagre-connect-dialog.png'; " +"md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" +msgstr "" +"@@image: 'figures/vinagre-connect-dialog.png'; " +"md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" + +#. 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/vinagre.xml:330(None) +#| msgid "" +#| "@@image: 'figures/vinagre-screenshot.png'; " +#| "md5=5ea2ba4ba469dadea877f19b6b33ced2" +msgid "" +"@@image: 'figures/vinagre-auth-needed.png'; " +"md5=3cd74cebc8d1d5e2c23b4419e28f6c11" +msgstr "" +"@@image: 'figures/vinagre-auth-needed.png'; " +"md5=3cd74cebc8d1d5e2c23b4419e28f6c11" + +#. 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/vinagre.xml:432(None) +#| msgid "" +#| "@@image: 'figures/vinagre-screenshot.png'; " +#| "md5=5ea2ba4ba469dadea877f19b6b33ced2" +msgid "" +"@@image: 'figures/vinagre-bookmarks-side-panel.png'; " +"md5=c657cdff0da28c73ac936227e490bb2e" +msgstr "" +"@@image: 'figures/vinagre-bookmarks-side-panel.png'; " +"md5=c657cdff0da28c73ac936227e490bb2e" + +#. 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/vinagre.xml:462(None) +msgid "" +"@@image: 'figures/vinagre-saving-bookmarks.png'; " +"md5=b99dbef848c5c0d487caecc320ed95de" +msgstr "" +"@@image: 'figures/vinagre-saving-bookmarks.png'; " +"md5=b99dbef848c5c0d487caecc320ed95de" + +#. 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/vinagre.xml:495(None) +#| msgid "" +#| "@@image: 'figures/vinagre-screenshot.png'; " +#| "md5=5ea2ba4ba469dadea877f19b6b33ced2" +msgid "" +"@@image: 'figures/vinagre-editing-bookmarks.png'; " +"md5=ac5097a12572cfce0561f0ca19bb1edb" +msgstr "" +"@@image: 'figures/vinagre-editing-bookmarks.png'; " +"md5=ac5097a12572cfce0561f0ca19bb1edb" #: C/vinagre.xml:25(title) msgid "Vinagre Manual" @@ -33,8 +98,9 @@ "απομακρυσμένης επιφάνειας εργασίας" #: C/vinagre.xml:32(year) -msgid "2007, 2008" -msgstr "2007, 2008" +#| msgid "2007, 2008" +msgid "2007, 2008, 2009" +msgstr "2007, 2008, 2009" #: C/vinagre.xml:33(holder) msgid "Jonh Wendell (wendell@bani.com.br)" @@ -158,118 +224,166 @@ msgid "vdepizzol@gmail.com" msgstr "vdepizzol@gmail.com" -#: C/vinagre.xml:80(revnumber) +#: C/vinagre.xml:65(firstname) +msgid "Jonh" +msgstr "Jonh" + +#: C/vinagre.xml:66(surname) +#| msgid "Jonh Wendell" +msgid "Wendell" +msgstr "Wendell" + +#: C/vinagre.xml:67(email) +#| msgid "Jonh Wendell (wendell@bani.com.br)" +msgid "wendell@bani.com.br" +msgstr "wendell@bani.com.br" + +#: C/vinagre.xml:86(revnumber) +#| msgid "0.2" +msgid "0.3" +msgstr "0.3" + +#: C/vinagre.xml:87(date) +#| msgid "2008-01-15" +msgid "2009-08-23" +msgstr "2009-08-23" + +#: C/vinagre.xml:89(para) +#| msgid "Jonh Wendell (wendell@bani.com.br)" +msgid "Jonh Wendell wendell@bani.com.br" +msgstr "Jonh Wendell wendell@bani.com.br" + +#: C/vinagre.xml:95(revnumber) msgid "0.2" msgstr "0.2" -#: C/vinagre.xml:81(date) +#: C/vinagre.xml:96(date) msgid "2008-01-15" msgstr "2008-01-15" -#: C/vinagre.xml:83(para) +#: C/vinagre.xml:98(para) msgid "Vinicius Depizzol vdepizzol@gmail.com" msgstr "Vinicius Depizzol vdepizzol@gmail.com" -#: C/vinagre.xml:89(revnumber) +#: C/vinagre.xml:104(revnumber) msgid "0.1" msgstr "0.1" -#: C/vinagre.xml:90(date) +#: C/vinagre.xml:105(date) msgid "2007-12-16" msgstr "2007-12-16" -#: C/vinagre.xml:92(para) +#: C/vinagre.xml:107(para) msgid "Jaap A. Haitsma jaap@haitsma.org" msgstr "Jaap A. Haitsma jaap@haitsma.org" -#: C/vinagre.xml:95(para) +#: C/vinagre.xml:110(para) msgid "Jaap A. Haitsma" msgstr "Jaap A. Haitsma" -#: C/vinagre.xml:101(title) +#: C/vinagre.xml:116(title) msgid "Feedback" msgstr "Ανάδραση" -#: C/vinagre.xml:102(para) +#: C/vinagre.xml:117(para) +#| msgid "" +#| "To report a bug or make a suggestion regarding this application you can " +#| "file a bug in our bug tracker." msgid "" "To report a bug or make a suggestion regarding the Vinagre application or " -"this manual, follow the directions in the Vinagre Contact " -"Page." -msgstr "" -"Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με την εφαρμογή " -"Vinagre ή με αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στη Σελίδα επικοινωνίας " -"τουVinagre." +"this manual, please file a bug at GNOME bugzilla page." +msgstr "" +"Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με αυτή την " +"εφαρμογή, μπορείτε να καταχωρήσετε μια αναφορά σφάλματος στον καταγραφέα " +"σφαλμάτων ." #: C/vinagre.xml:0(application) msgid "Vinagre" msgstr "Vinagre" -#: C/vinagre.xml:116(primary) +#: C/vinagre.xml:131(primary) msgid "remote desktop" msgstr "απομακρυσμένη επιφάνεια εργασίας" -#: C/vinagre.xml:122(title) +#: C/vinagre.xml:137(title) msgid "Introduction" msgstr "Εισαγωγή" -#: C/vinagre.xml:128(secondary) +#: C/vinagre.xml:143(secondary) msgid "Manual" msgstr "Εγχειρίδιο" -#: C/vinagre.xml:129(tertiary) +#: C/vinagre.xml:144(tertiary) msgid "vinagre" msgstr "vinagre" -#: C/vinagre.xml:132(para) +#: C/vinagre.xml:147(para) +#| msgid "" +#| "The Vinagre application is a Remote Desktop Viewer for the " +#| "GNOME desktop that uses Virtual Network " +#| "Computing (VNC) system to remotely control another computer." msgid "" "The Vinagre application is a Remote Desktop Viewer for the GNOME " -"desktop that uses Virtual Network Computing (VNC) system to " -"remotely control another computer." +"desktop that uses Virtual Network Computing (VNC) system (and " +"possibly other protocols) to remotely control another computer." msgstr "" -"Το Vinagre είναι μια εφαρμογή για Σύνδεση απομακρυσμένης επιφάνειας εργασίας " +"Το Vinagre είναι μια εφαρμογή για σύνδεση απομακρυσμένης επιφάνειας εργασίας " "για την Επιφάνεια εργασίας GNOME, η οποία " -"χρησιμοποιεί το σύστημα Εικονικής χρήσης υπολογιστή μέσω δικτύου (VNC) για " -"απομακρυσμένο έλεγχο ενός υπολογιστή." +"χρησιμοποιεί το σύστημα εικονικής χρήσης υπολογιστή μέσω δικτύου (VNC) για " +"έλεγχο από απόσταση ενός υπολογιστή." -#: C/vinagre.xml:133(para) +#: C/vinagre.xml:148(para) msgid "Vinagre provides the following features:" msgstr "Το Vinagre παρέχει τα εξής χαρακτηριστικά:" -#: C/vinagre.xml:136(para) +#: C/vinagre.xml:151(para) msgid "Connect to several machines at the same time." msgstr "Ταυτόχρονη σύνδεση σε πολλά μηχανήματα." -#: C/vinagre.xml:139(para) +#: C/vinagre.xml:154(para) msgid "Store recently connections and allows to bookmark them." msgstr "" "Αποθήκευση πρόσφατων συνδέσεων και δυνατότητα τοποθέτησης σελιδοδεικτών σ' " "αυτές." -#: C/vinagre.xml:142(para) -msgid "Browse local network for VNC Servers." +#: C/vinagre.xml:157(para) +#| msgid "Browse local network for VNC Servers." +msgid "Browse local network for machines." msgstr "Περιήγηση στο τοπικό δίκτυο για εξυπηρετητές VNC." -#: C/vinagre.xml:150(title) +#: C/vinagre.xml:160(para) +msgid "" +"Provide a GNOME Panel applet to quickly access your bookmarked machines." +msgstr "" +"Παροχή μικροεφαρμογής του πίνακα εφαρμογών του GNOME για γρήγορη πρόσβαση σε " +"υπολογιστές που έχετε προσθέσει στους σελιδιδείκτες σας." + +#: C/vinagre.xml:163(para) +msgid "Extensible through its plugin structure." +msgstr "Επεκτάσιμο μέσω του συστήματος των plugin του." + +#: C/vinagre.xml:171(title) msgid "Getting Started" msgstr "Ξεκινώντας" -#: C/vinagre.xml:155(title) +#: C/vinagre.xml:176(title) msgid "Starting Vinagre" msgstr "Ξεκινώντας το Vinagre" -#: C/vinagre.xml:156(para) +#: C/vinagre.xml:177(para) msgid "You can start Vinagre in the following ways:" msgstr "" "Μπορείτε να ξεκινήσετε το Vinagre με τους εξής " "τρόπους:" -#: C/vinagre.xml:159(term) +#: C/vinagre.xml:180(term) msgid "Applications menu" msgstr "Μενού Εφαρμογές" -#: C/vinagre.xml:161(para) +#: C/vinagre.xml:182(para) msgid "" "Choose InternetRemote " "Desktop Viewer." @@ -277,27 +391,65 @@ "Επιλέξτε ΔιαδίκτυοΣύνδεση " "απομακρυσμένης επιφ. εργασίας." -#: C/vinagre.xml:165(term) +#: C/vinagre.xml:186(term) msgid "Command line" msgstr "Γραμμή εντολών" -#: C/vinagre.xml:167(para) +#: C/vinagre.xml:188(para) msgid "Execute the following command: vinagre" msgstr "Εκτελέστε την εξής εντολή: vinagre" -#: C/vinagre.xml:174(title) +#: C/vinagre.xml:196(title) +#| msgid "Starting Vinagre" +msgid "Starting Vinagre from a command line" +msgstr "Ξεκινώντας το Vinagre από την γραμμή εντολών" + +#: C/vinagre.xml:197(para) +msgid "" +"You can run Vinagre from a command line and " +"connect to a single machine or multiple machines. To connect to a machine " +"from a command line, type the following command, then press Return:" +msgstr "" +"Μπορείτε να εκτελέσετε το Vinagre από την γραμμή " +"εντολών και να συνδεθείτε με έναν ή περισσότερους υπολογιστές. Για να " +"συνδεθείτε με έναν υπολογιστή από την γραμμή εντολών, πληκτρολογήστε την " +"εξής ςντολή, και πιέστε το πλήκτρο Return:" + +#: C/vinagre.xml:198(replaceable) +msgid "hostname_or_ip_address" +msgstr "hostname_ή_διεύθυνση_ip" + +#: C/vinagre.xml:198(command) +msgid "vinagre " +msgstr "vinagre " + +#: C/vinagre.xml:199(para) +msgid "" +"For more information on how to run Vinagre from a " +"command line, see the unix manual page for Vinagre, Vinagre1." +msgstr "" +"Για περισσότερες πληροφορίες σχετικά με την εκτέλεση του " +"Vinagre από την γραμμή εντολών, δείτε την σελίδα " +"unix manual page for Vinagre, Vinagre1." + +#: C/vinagre.xml:206(title) msgid "The Vinagre Window" msgstr "Το παράθυρο του Vinagre" -#: C/vinagre.xml:176(title) +#: C/vinagre.xml:208(title) msgid "Vinagre window" msgstr "Το παράθυρο του Vinagre" -#: C/vinagre.xml:182(phrase) +#: C/vinagre.xml:214(phrase) msgid "Shows vinagre main window." msgstr "Δείχνει το κύριο παράθυρο του Vinagre" -#: C/vinagre.xml:188(para) +#: C/vinagre.xml:220(para) msgid "" "The Vinagre window contains the following " "elements:" @@ -305,11 +457,11 @@ "Το παράθυρο της εφαρμογής Vinagre περιέχει τα " "ακόλουθα στοιχεία:" -#: C/vinagre.xml:193(term) +#: C/vinagre.xml:225(term) msgid "Menubar" msgstr "Μπάρα μενού" -#: C/vinagre.xml:195(para) +#: C/vinagre.xml:227(para) msgid "" "The menus on the menubar contain all of the commands you need to work with " "remote connections in Vinagre." @@ -318,11 +470,11 @@ "να δουλέψετε με απομακρυσμένες συνδέσεις στο Vinagre." -#: C/vinagre.xml:199(term) +#: C/vinagre.xml:231(term) msgid "Toolbar" msgstr "Εργαλειοθήκη" -#: C/vinagre.xml:201(para) +#: C/vinagre.xml:233(para) msgid "" "The toolbar contains a subset of the most used commands that you can access " "from the menubar." @@ -330,11 +482,11 @@ "Η εργαλειοθήκη περιέχει ένα υποσύνολο των πιο συχνά χρησιμοποιημένων εντολών " "στις οποίες μπορείτε να έχετε πρόσβαση από τη μπάρα μενού." -#: C/vinagre.xml:205(term) +#: C/vinagre.xml:237(term) msgid "Display Area" msgstr "Περιοχή προβολής" -#: C/vinagre.xml:207(para) +#: C/vinagre.xml:239(para) msgid "" "The display area contains a list of tabs with the connected machines and its " "remote desktops." @@ -342,11 +494,11 @@ "Η περιοχή προβολής περιέχει μια λίστα με καρτέλες με τα συνδεδεμένα " "μηχανήματα και τις απομακρυσμένες επιφάνειες εργασίας τους." -#: C/vinagre.xml:211(term) +#: C/vinagre.xml:243(term) msgid "Statusbar" msgstr "Γραμμή κατάστασης" -#: C/vinagre.xml:213(para) +#: C/vinagre.xml:245(para) msgid "" "The statusbar displays information about current Vinagre activity and contextual information about the menu items." @@ -355,60 +507,187 @@ "Vinagre και πληροφορίες περιεχομένου για τα " "αντικείμενα του μενού." -#: C/vinagre.xml:217(term) +#: C/vinagre.xml:249(term) msgid "Side Pane" msgstr "Πλευρικό πλαίσιο" -#: C/vinagre.xml:219(para) -msgid "The side pane contains a list of bookmarked connections." +#: C/vinagre.xml:251(para) +#| msgid "The side pane contains a list of bookmarked connections." +msgid "" +"The side pane contains a list of bookmarked connections and (if available) a " +"list of auto-discovered network machines." +msgstr "" +"Το πλευρικό πλαίσιο περιέχει μια λίστα από συνδέσεις.που υπάρχουν στους " +"σελιδοδείκτες και (αν είναι διαθέσιμοι) μια λίστα από υπολογιστές δικτύου " +"που έχουν ανιχνευθεί αυτόματα." + +#: C/vinagre.xml:259(title) +#| msgid "Starting Vinagre" +msgid "Some notes about Vinagre" +msgstr "Σημειώσεις για το Vinagre" + +#: C/vinagre.xml:260(para) +msgid "" +"As a tool to access other machines, Vinagre behaves slightly different than " +"other GNOME applications in its default " +"installation." +msgstr "" +"Σαν εργαλείο πρόσβασης σε άλλους υπολογιστές, το Vinagre συμπεριφέρεται " +"κάπως διαφορετικά από άλλες εφαρμογές του GNOME " +"στην προεπιλεγμένη του εγκατάσταση." + +#: C/vinagre.xml:261(para) +msgid "" +"Vinagre comes with menu accelerators and keyboard shortcuts disabled by " +"default. This avoids keys being intercepted by Vinagre when you wanted to " +"send those keys to the remote machine." +msgstr "" +"Το Vinagre έχει τις συντομεύσεις πληκτρολογίου και τα πλήκτρα γρήγορης " +"πρόσβασης απενεργοποιημένα από προεπιλογή. Αυτό αποτρέπει την παρεμπόδιση " +"από το Vinagre αν η πληκτρολόγηση αφορά τον απομακρυσμένο υπολογιστή." + +#: C/vinagre.xml:262(para) +msgid "" +"For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by " +"default." +msgstr "" +"Για παράδειγμα, η συντόμευση πληκτρολογίου για κλείσιμο καρτέλας είναι " +"Ctrl+W, αλλά αυτός ο συνδυασμός πλήκτρων θα σταλεί στον " +"απομακρυσμένο υπολογιστή από προεπιλογή." + +#: C/vinagre.xml:263(para) +#| msgid "" +#| "To close a connection, choose MachineClose." +msgid "" +"If you want to change this behavior, go to Vinagre preferences in " +"EditPreferences." msgstr "" -"Το πλευρικό πλαίσιο περιέχει μια λίστα από σελιδοδείκτες προς συνδέσεις." +"Αν θέλετε να αλλάξετε αυτή την συμπεριφορά, πηγαίνετε στις προτιμήσεις του " +"Vinagre από ΕπεξεργασίαΠροτιμήσεις." -#: C/vinagre.xml:228(title) +#: C/vinagre.xml:275(title) msgid "Using Vinagre" msgstr "Χρησιμοποιώντας το Vinagre" -#: C/vinagre.xml:231(title) -msgid "To connect with a remote machine" +#: C/vinagre.xml:278(title) +#| msgid "To connect with a remote machine" +msgid "To connect to a remote machine" msgstr "Για να συνδεθείτε με ένα απομακρυσμένο σύστημα" -#: C/vinagre.xml:234(title) -msgid "Informing Host address" -msgstr "" - -#: C/vinagre.xml:235(para) +#: C/vinagre.xml:281(title) +#| msgid "Informing Host address" +msgid "Informing a host address" +msgstr "Ορισμός διεύθυνσης συστήματος" + +#: C/vinagre.xml:282(para) +#| msgid "" +#| "To connect with a remote machine, choose " +#| "CtrlNMachineConnect. The Connection Dialog is " +#| "displayed. Inform the Host and the Port of the connection and click the Connect " +#| "button. You can also use the Find button to browse " +#| "available machines on local network." msgid "" "To connect with a remote machine, choose " "CtrlNMachineConnect. The Connection Dialog is " -"displayed. Inform the Host and the PortProtocol and the Host of the connection and click the Connect " -"button. You can also use the Find button to browse " -"available machines on local network." +"button. You will see a bunch of options depending on what protocol you have " +"selected." msgstr "" - -#: C/vinagre.xml:246(para) -msgid "" -"Some machines may require a secure connection. In this case, a " -"Password dialog will be displayed asking for the " -"connection password. If you check Remember this passwordCtrlNΣύστημαΣύνδεση. Ο Διάλογος σύνδεσης " +"εμφανίζεται. Ορίστε το Σύστημα και την Πόρτα της σύνδεσης και πατήστε Σύνδεση. Μπορείτε " +"επίσης να χρησιμοποιήσετε το κουμπί Εύρεση για να " +"αναζητήσετε διαθέσιμα συστήματα στο τοπικό σας δίκτυο." + +#: C/vinagre.xml:294(title) +msgid "Connect dialog" +msgstr "Διάλογος σύνδεσης" + +#: C/vinagre.xml:300(phrase) +msgid "Shows the connect dialog." +msgstr "Εμφανίζει τον διάλογο σύνδεσης." + +#: C/vinagre.xml:306(para) +msgid "" +"You can also use the Find button to browse available " +"machines on local network." +msgstr "" +"Μπορείτε επίσης να χρησιμοποιήσετε το πλήκτρο Find " +"για να περιηγηθείτε σε διαθέσιμους υπολογιστές στο τοπικό δίκτυο." + +#: C/vinagre.xml:310(para) +msgid "" +"The availabity of the Find button depends on the " +"protocol you have selected. Vinagre relies on Avahi service to browse for machines in your local network. Also, " +"notice that Vinagre can be compiled without Avahi " +"support. In this case, this button will not be available." +msgstr "" +"Η διαθεσιμότητα του πλήκτρου Find εξαρτάται από το " +"πρωτόκολλο που έχετε επιλέξει. Το Vinagre στηρίζεται στην υπηρεσία " +"Avahi για την περιήγηση στο τοπικό σας δίκτυο. " +"Σημειώστε επίσης ότι το Vinagre μπορεί να μεταγλωτιστεί χωρίς υποστήριξη " +"Avahi. Σε αυτή την περίπτωση, αυτό το πλήκτρο δεν " +"θα είανι διαθέσιμο." + +#: C/vinagre.xml:318(para) +#| msgid "" +#| "Some machines may require a secure connection. In this case, a " +#| "Password dialog will be displayed asking for the " +#| "connection password. If you check Remember this password, Vinagre will store the secure " +#| "information using GNOME Keyring Manager." +msgid "" +"Some machines may require a secure connection. In this case, an " +"Authentication dialog will be displayed asking for the " +"credentials. The type of credentials depends on the server. It may be a " +"password and an username. If you check Remember this credential, Vinagre will store the secure " "information using GNOME Keyring Manager." msgstr "" +"Κάποια συστήματα μπορεί να απαιτούν μια ασφαλή σύνδεση. Σε αυτή την " +"περίπτωση, ένας διάλογος Κωδικός πρόσβασης θα " +"εμφανιστεί και θα ζητάει τον κωδικό πρόσβασης για την σύνδεση. Αν επιλέξετε " +"το Απομνημόνευση αυτού του κωδικού, το " +"Vinagre θα αποθηκεύσει τις πληροφορίες ασφαλώς με " +"την χρήση του GNOME Keyring Manager." + +#: C/vinagre.xml:326(title) +msgid "Authentication dialog" +msgstr "Διάλογος επικύρωσης" + +#: C/vinagre.xml:332(phrase) +msgid "Shows the authentication dialog." +msgstr "Εμφανίζει τον διάλογο επικύρωσης." -#: C/vinagre.xml:253(para) +#: C/vinagre.xml:337(para) msgid "" "If the connection has been used previously, you can also access it by " "MachineRecent connections...." msgstr "" +"Αν η σύνδεση έχει χρησιμοποιηθεί παλιότερα, μπορείτε επίσης να έχετε " +"πρόσβαση σε αυτήν με την επιλογή ΣύστημαΠρόσφατες συνδέσεις." -#: C/vinagre.xml:263(title) +#: C/vinagre.xml:347(title) msgid "Opening a Remote Connection File" -msgstr "" +msgstr "Άνοιγμα ενός αρχείου απομακρυσμένης σύνδεσης" -#: C/vinagre.xml:264(para) +#: C/vinagre.xml:348(para) msgid "" "Some hosts distribute remote connection files (generally ending with suffix " "\".vnc\") instead of inform Host address and Port. To open a remote " @@ -418,94 +697,300 @@ "File dialog is displayed. Select the file you want to open, then " "click on the Open button." msgstr "" +"Κάποια συστήματα διανέμουν αρχεία απομακρυσμένης σύνδεσης (συνήθως " +"καταλήγουν με την επέκταση \".vnc\") αντί να δίνουν την διεύθυνση συστήματος " +"και την πόρτα. Για να ανοίξετε ένα αρχείο απομακρυσμένης σύνδεσης, επιλέξτε " +"CtrlOΣύστημαΆνοιγμα. Ο διάλογος Επιλογή αρχείου εμφανίζεται. Επιλέξτε το αρχείο που θέλετε να ανοίξετε, και μετά " +"κάντε κλικ στο κουμπί Άνοιγμα." -#: C/vinagre.xml:276(para) +#: C/vinagre.xml:360(para) msgid "" "You can also double-click on a remote connection file in the " "Nautilus file manager to open it on the " "Vinagre window." msgstr "" +"Μπορείτε επίσης να κάνετε διπλό κλικ σε ένα αρχείο απομακρυσμένης σύνδεσης " +"στον διαχειριστή αρχείων Ναυτίλο για να το " +"ανοίξετε στο παράθυρο του Vinagre." -#: C/vinagre.xml:284(title) -msgid "To Create a New Bookmark" +#: C/vinagre.xml:367(title) C/vinagre.xml:419(title) C/vinagre.xml:422(title) +msgid "Using Bookmarks" +msgstr "Χρήση σελιδοδεικτών" + +#: C/vinagre.xml:368(para) +msgid "" +"You can access your mostly used connections through bookmarks. See the Bookmarks chapter." msgstr "" +"Μπορείτε να έχετε πρόσβαση στις πιο συχνά χρησιμοποιούμενες συνδέσεις σας " +"μέσω σελιδοδεικτών. Δείτε το Κεφάλαιο " +"σελιδοδείκτες." -#: C/vinagre.xml:285(para) +#: C/vinagre.xml:376(title) +msgid "To Use Full Screen Mode" +msgstr "Για να χρησιμοποιήσετε την λειτουργία πλήρους οθόνης" + +#: C/vinagre.xml:377(para) +#| msgid "" +#| "To zoom the Display Area to full screen mode, choose " +#| "F11ViewFull Screen. To exit full " +#| "screen mode, press F11 or CtrlAlt." msgid "" -"To bookmark the currently viewed connection, choose " -"CtrlDBookmarksAdd to " -"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and click " -"Ok." +"To zoom the Display Area to full screen mode, choose " +"F11ViewFull Screen or the " +"corresponding tool bar button." msgstr "" +"Για να μεγεθύνετε την περιοχή εμφάνισης σε πλήρη οθόνη, επιλέξτε " +"F11ΠροβολήΠλήρης οθόνη ή το αντίστοιχο " +"πλήκτρο της γραμμής εργαλείων." + +#: C/vinagre.xml:385(para) +msgid "" +"While in full screen mode, move the mouse to the top center of the screen to " +"show a hidden tool bar, which has buttons to leave full screen mode, close " +"the connection and other options." +msgstr "" +"Όταν είστε σε λειτουργία πλήρους οθόνης, μετακινήστε το ποντίκι στο επάνω " +"μέρος της οθόνης, στο κέντρο της για να εμφανιστεί η κρυφή γραμμή εργαλείων, " +"που έχει πλήκτρα για βγείτε από την λειτουργία πλήρους οθόνης, να κλείσετε " +"την σύνδεση και άλλες επιλογές." -#: C/vinagre.xml:296(title) -msgid "To Remove a Bookmark" +#: C/vinagre.xml:394(title) +msgid "To Close a Connection" +msgstr "Για να κλείσετε μια σύνδεση" + +#: C/vinagre.xml:395(para) +msgid "" +"To close a connection, choose MachineClose." msgstr "" +"Για να κλείσετε μια σύνδεση, επιλέξτε ΣύστημαΚλείσιμο." + +#: C/vinagre.xml:404(title) +msgid "To Take Screenshot" +msgstr "Για να κάνετε λήψη στιγμιότυπου" -#: C/vinagre.xml:297(para) +#: C/vinagre.xml:405(para) msgid "" -"To remove a bookmark, choose Remove from the " -"context menu of the bookmark in the Side Pane." +"To take screenshot of the current remote desktop, choose " +"MachineTake Screenshot or press the relative button in the toolbar. The Save " +"Screenshot dialog is displayed, click the Save button to save the screenshot." msgstr "" +"Για να κάνετε λήψη στιγμιότυπου της τρέχουσας απομακρυσμένης επιφάνειας " +"εργασίας, επιλέξτε ΣύστημαΛήψη " +"στιγμιότυπου ή πατήστε το αντίστοιχο κουμπί στην " +"εργαλειοθήκη. Ο διάλογος Αποθήκευση στιγμιότυπου " +"εμφανίζεται, κάντε κλικ στο κουμπί Αποθήκευση για να " +"αποθηκεύσετε το στιγμιότυπο." -#: C/vinagre.xml:304(title) -msgid "To Edit a Bookmark's Properties" +#: C/vinagre.xml:423(para) +msgid "" +"Bookmarks are a resource to keep around machines you access frequently. They " +"are visible at side panel or in the Bookmarks menu." msgstr "" +"Οι σελιδοδείκτες είναι ένα μέσο για να έχετε εύκολη πρόσβαση σε υπολογιστές " +"στους οποίους συνδέεστε συχνά. Εμφανίζονται σε πλευρικό πίνακα ή στο μενού " +"Σελιδοδείκτες." -#: C/vinagre.xml:305(para) +#: C/vinagre.xml:428(title) +msgid "Bookmarks at side panel" +msgstr "Σελιδοδείκτες στον πλευρικό πίνακα" + +#: C/vinagre.xml:434(phrase) +msgid "Shows bookmarks at side panel." +msgstr "Εμφανίζει σελιδοδείκτες στον πλευρικό πίνακα" + +#: C/vinagre.xml:440(para) msgid "" -"To edit a bookmark's properties, such as it's name and host, choose " -"Edit from the context menu of the bookmark in the " -"Side Pane." +"As you move the mouse around the entries, a tooltip will show you the " +"hostname of the connection. To connect to a machine, just double click on a " +"entry." msgstr "" +"Καθώς μετακινείτε το ποντίκι στις καταχωρήσεις, ένα κείμενο υπόδειξης θα σας " +"δείξει το όνομα εξυπηρετητή (hostname) της σύνδεσης. Για να συνδεθείτε σε " +"έναν υπολογιστή, κάντε διπλό κλικ στην εγγραφή." -#: C/vinagre.xml:312(title) -msgid "To Use Full Screen Mode" +#: C/vinagre.xml:447(title) +msgid "To Create a New Bookmark" +msgstr "Για να δημιουργήσετε νέο σελιδοδείκτη" + +#: C/vinagre.xml:448(para) +#| msgid "" +#| "To bookmark the currently viewed connection, choose " +#| "CtrlDBookmarksAdd to " +#| "Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and " +#| "click Ok." +msgid "" +"To bookmark the currently viewed connection, choose " +"CtrlDBookmarksAdd to " +"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and " +"optionally other data, such as the folder and click Save." msgstr "" +"Για να προσθέσετε στους σελιδοδείκτες την τρέχουσα σύνδεση, επιλέξτε " +"CtrlDΣελιδοδείκτεςΠροσθήκη " +"στους σελιδοδείκτες. Ο διάλογος " +"Αποθήκευση στους σελιδοδείκτες εμφανίζεται. Εισάγετε το " +"όνομα της σύνδεσης και προαιρετικά άλλα στοιχεία, όπως τον κατάλογο και " +"κάντε κλικ στο OK." + +#: C/vinagre.xml:458(title) +msgid "Saving a bookmark" +msgstr "Αποθήκευση σελιδοδείκτη" + +#: C/vinagre.xml:464(phrase) +msgid "Shows the Saving to Bookmarks dialog." +msgstr "Εμφανίζει τον διάλογο αποθήκευση στους σελιδοδείκτες." + +#: C/vinagre.xml:471(para) +msgid "" +"You can use folders to organize your bookmarks. To create a folder, right " +"click in the side panel and choose the option New Folder " +"in the context menu, or go to menu BookmarksNew Folder." +msgstr "" +"Μπορείτε να χρησιμοποιήσετε φακέλους για να οργανώσετε τους σελιδοδείκτες " +"σας. Για να δημιουργήσετε έναν φάκελλο, κάντε δεξί κλικ στον πλευρικό πίνακα " +"και επιλέξτε Νέος φάκελος από το αναδυόμενο μενού, ή " +"πηγαίνετε στο μενού ΣελιδοδείκτεςΝέος φάκελος." + +#: C/vinagre.xml:484(title) +msgid "To Edit a Bookmark's Properties" +msgstr "Για να επεξεργαστείτε τις ιδιότητες ενός σελιδοδείκτη" -#: C/vinagre.xml:313(para) +#: C/vinagre.xml:485(para) +#| msgid "" +#| "To edit a bookmark's properties, such as it's name and host, choose " +#| "Edit from the context menu of the bookmark in " +#| "the Side Pane." msgid "" -"To zoom the Display Area to full screen mode, choose " -"F11ViewFull Screen. To exit full " -"screen mode, press F11 or CtrlAlt." +"To edit a bookmark's properties, such as it's name and host, choose " +"Edit bookmark from the context menu of the " +"bookmark in the Side Pane. The same dialog as shown above will be displayed." msgstr "" +"Για να επεξεργαστείτε τις ιδιότητες ενός σελιδοδείκτη, όπως το όνομα του και " +"τον εξυπηρετητή, επιλέξτε Επεξεργασία σελιδοδείκτη από το μενού περιεχομένων του σελιδοδείκτη στο πλαϊνό πλαίσιο. " +"Ο ίδιος διάλογος που φαίνεται παραπάνω θα προβληθεί." + +#: C/vinagre.xml:491(title) +msgid "Editing a bookmark" +msgstr "Επεξεργασία σελιδοδείκτη" + +#: C/vinagre.xml:497(phrase) +msgid "Context menu option to edit a bookmark" +msgstr "Επιλογή μενού περιεχομένων για την επεξεργασία σελιδοδείκτη" + +#: C/vinagre.xml:503(para) +msgid "You can also edit a folder." +msgstr "Μπορείτε επίσης να επεξεργαστείτε έναν φάκελο." -#: C/vinagre.xml:324(title) -msgid "To Close a Connection" +#: C/vinagre.xml:507(title) +msgid "To Remove a Bookmark" +msgstr "Για να αφαιρέσετε ένα σελιδοδείκτη" + +#: C/vinagre.xml:508(para) +#| msgid "" +#| "To remove a bookmark, choose Remove from the " +#| "context menu of the bookmark in the Side Pane." +msgid "" +"To remove a bookmark, choose Remove from bookmarks from " +"the context menu of the bookmark in the Side Pane." msgstr "" +"Για να αφαιρέσετε ένα σελιδοδείκτη, επιλέξτε Αφαίρεση από το μενού περιεχομένων του σελιδοδείκτη στο πλαϊνό πλαίσιο." -#: C/vinagre.xml:325(para) +#: C/vinagre.xml:512(para) msgid "" -"To close a connection, choose MachineClose." +"You can also remove a folder. Notice that removing a folder will remove all " +"its entries. A confirmation dialog will be shown." msgstr "" +"Μπορείτε επίσης να αφαιρέσετε έναν φάκελο. Σημειώστε ότι απομακρύνοντας έναν " +"φάκελο θα αφαιρεθούν και όλες οι εγγραφές του. Ένας διάλογος επιβεβαίωσης θα " +"εμφανισθεί." -#: C/vinagre.xml:334(title) -msgid "To Take Screenshot" +#: C/vinagre.xml:518(title) +msgid "Preferences" +msgstr "Προτιμήσεις" + +#: C/vinagre.xml:519(para) +#| msgid "" +#| "To close a connection, choose MachineClose." +msgid "" +"To configure Vinagre, choose " +"EditPreferences. The Preferences dialog contains the " +"following items:" msgstr "" +"Για να προσαρμόσετε το Vinagre, επιλέξτε " +"ΕπεξεργασίαΠροτιμήσεις. Ο διάλογος Προτιμήσεις " +"περιέχει τα εξής στοιχεία:" -#: C/vinagre.xml:335(para) +#: C/vinagre.xml:523(guilabel) +msgid "Always show tabs" +msgstr "Πάντα εμφάνιση καρτελών" + +#: C/vinagre.xml:525(para) msgid "" -"To take screenshot of the current remote desktop, choose " -"MachineTake Screenshot or press the relative button in the toolbar. The Save " -"Screenshot dialog is displayed, click the Save button to save the screenshot." +"Select this option to make the tabs always visible, even when only one " +"connection is active." msgstr "" +"Επιλέξτε αυτή την λειτουργία για να κάνετε τις καρτέλλες πάντα ορατές, ακόμη " +"και όταν μόνο μία σύνδεση είναι ενεργή." -#: C/vinagre.xml:349(title) +#: C/vinagre.xml:530(guilabel) +msgid "Show menu shortcuts" +msgstr "Εμφάνιση συντομεύσεων πληκτρολογίου" + +#: C/vinagre.xml:532(para) +msgid "" +"By selecting this option, keyboard shortcuts, like Ctrl+D and menu accelerators, like Alt+M to access " +"the Machine menu, will be enabled. This means that Vinagre will catch those " +"key combinations, instead of sending them to the remote machine. Because " +"most of the time you will be working on the remote machine, this option " +"comes disabled by default." +msgstr "" +"Επιλέγοντας αυτή την λειτουργία, οι συντομεύσεις πληκτρολογίου, όπως " +"Ctrl+D και τα πλήκτρα άμεσης πρόσβασης, όπως " +"Alt+M για πρόσβαση στο μενού του υπολογιστή, θα " +"ενεργοποιηθούν. Αυτό σημαίνει ότι το Vinagre θα συλλαμβάνει αυτούς τους " +"συνδυασμούς πλήκτρων αντί να τους στέλνει στον απομακρυσμένο υπολογιστή. " +"Επειδή τις περισσότερες φορές θα εργάζεστε στον απομακρυσμένο υπολογιστή, " +"αυτή η επιλογή είναι απενεργοποιημένη από προεπιλογή." + +#: C/vinagre.xml:543(title) msgid "About" msgstr "Περί" -#: C/vinagre.xml:350(para) +#: C/vinagre.xml:544(para) +#| msgid "" +#| "Vinagre was written by Jonh Wendell wendell@bani.com.br. " +#| "To find more information about Vinagre, please visit the Vinagre web page." msgid "" "Vinagre was written by Jonh Wendell wendell@bani.com.br. To " "find more information about Vinagre, please visit the VinagreVinagre web page." msgstr "" "Το Vinagre δημιουργήθηκε από τον Jonh Wendell wendell@bani.com.brιστότοπο τουVinagre." -#: C/vinagre.xml:356(para) +#: C/vinagre.xml:549(para) msgid "" "To report a bug or make a suggestion regarding this application you can file " "a bug in our καταγραφέα σφαλμάτων." -#: C/vinagre.xml:362(para) +#: C/vinagre.xml:555(para) msgid "" "This program is distributed under the terms of the GNU General Public " "license as published by the Free Software Foundation; either version 2 of " @@ -545,7 +1030,17 @@ #: C/vinagre.xml:0(None) msgid "translator-credits" msgstr "" -"Ελληνική μεταφραστική ομάδα του GNOME\n" +"Ελληνική μεταφραστική ομάδα GNOME , 2009\n" "Μάριος Ζηντίλης , 2009\n" -"\n" -"Για περισσότερα δείτε http://gnome.gr/" +"Στέργιος Προσινικλής , 2009" + +#~ msgid "" +#~ "To report a bug or make a suggestion regarding the Vinagre application or " +#~ "this manual, follow the directions in the Vinagre " +#~ "Contact Page." +#~ msgstr "" +#~ "Για να αναφέρετε ένα σφάλμα ή να κάνετε μια πρόταση σχετικά με την " +#~ "εφαρμογή Vinagre ή με αυτό το εγχειρίδιο, ακολουθήστε τις οδηγίες στη " +#~ "Σελίδα επικοινωνίας τουVinagre." diff -Nru vinagre-2.26.1/help/el/vinagre.xml vinagre-2.29.1/help/el/vinagre.xml --- vinagre-2.26.1/help/el/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/el/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +145,7 @@ vinagre - Το Vinagre είναι μια εφαρμογή για Σύνδεση απομακρυσμένης επιφάνειας εργασίας για την Επιφάνεια εργασίας GNOME, η οποία χρησιμοποιεί το σύστημα Εικονικής χρήσης υπολογιστή μέσω δικτύου (VNC) για απομακρυσμένο έλεγχο ενός υπολογιστή. + Το Vinagre είναι μια εφαρμογή για σύνδεση απομακρυσμένης επιφάνειας εργασίας για την Επιφάνεια εργασίας GNOME, η οποία χρησιμοποιεί το σύστημα εικονικής χρήσης υπολογιστή μέσω δικτύου (VNC) για έλεγχο από απόσταση ενός υπολογιστή. Το Vinagre παρέχει τα εξής χαρακτηριστικά: @@ -144,6 +157,12 @@ Περιήγηση στο τοπικό δίκτυο για εξυπηρετητές VNC. + + Παροχή μικροεφαρμογής του πίνακα εφαρμογών του GNOME για γρήγορη πρόσβαση σε υπολογιστές που έχετε προσθέσει στους σελιδιδείκτες σας. + + + Επεκτάσιμο μέσω του συστήματος των plugin του. +
@@ -154,7 +173,7 @@ -
+
Ξεκινώντας το Vinagre Μπορείτε να ξεκινήσετε το Vinagre με τους εξής τρόπους: @@ -172,8 +191,19 @@
- -
+ + +
+ Ξεκινώντας το Vinagre από την γραμμή εντολών + Μπορείτε να εκτελέσετε το Vinagre από την γραμμή εντολών και να συνδεθείτε με έναν ή περισσότερους υπολογιστές. Για να συνδεθείτε με έναν υπολογιστή από την γραμμή εντολών, πληκτρολογήστε την εξής ςντολή, και πιέστε το πλήκτρο Return: + vinagre hostname_ή_διεύθυνση_ip + Για περισσότερες πληροφορίες σχετικά με την εκτέλεση του Vinagre από την γραμμή εντολών, δείτε την σελίδα unix manual page for Vinagre, Vinagre1. +
+ + + + +
Το παράθυρο του Vinagre
Το παράθυρο του Vinagre @@ -218,12 +248,21 @@ Πλευρικό πλαίσιο - Το πλευρικό πλαίσιο περιέχει μια λίστα από σελιδοδείκτες προς συνδέσεις. + Το πλευρικό πλαίσιο περιέχει μια λίστα από συνδέσεις.που υπάρχουν στους σελιδοδείκτες και (αν είναι διαθέσιμοι) μια λίστα από υπολογιστές δικτύου που έχουν ανιχνευθεί αυτόματα.
+ +
+ Σημειώσεις για το Vinagre + Σαν εργαλείο πρόσβασης σε άλλους υπολογιστές, το Vinagre συμπεριφέρεται κάπως διαφορετικά από άλλες εφαρμογές του GNOME στην προεπιλεγμένη του εγκατάσταση. + Το Vinagre έχει τις συντομεύσεις πληκτρολογίου και τα πλήκτρα γρήγορης πρόσβασης απενεργοποιημένα από προεπιλογή. Αυτό αποτρέπει την παρεμπόδιση από το Vinagre αν η πληκτρολόγηση αφορά τον απομακρυσμένο υπολογιστή. + Για παράδειγμα, η συντόμευση πληκτρολογίου για κλείσιμο καρτέλας είναι Ctrl+W, αλλά αυτός ο συνδυασμός πλήκτρων θα σταλεί στον απομακρυσμένο υπολογιστή από προεπιλογή. + Αν θέλετε να αλλάξετε αυτή την συμπεριφορά, πηγαίνετε στις προτιμήσεις του Vinagre από ΕπεξεργασίαΠροτιμήσεις. +
+
@@ -233,119 +272,175 @@ Για να συνδεθείτε με ένα απομακρυσμένο σύστημα
- Informing Host address - To connect with a remote machine, choose - - CtrlN - Machine - Connect - . The Connection Dialog is displayed. - Inform the Host and the Port of - the connection and click the Connect button. You can - also use the Find button to browse available machines on local network. - + Ορισμός διεύθυνσης συστήματος + Για να συνδεθείτε με ένα απομακρυσμένο σύστημα, επιλέξτε CtrlNΣύστημαΣύνδεση. Ο Διάλογος σύνδεσης εμφανίζεται. Ορίστε το Σύστημα και την Πόρτα της σύνδεσης και πατήστε Σύνδεση. Μπορείτε επίσης να χρησιμοποιήσετε το κουμπί Εύρεση για να αναζητήσετε διαθέσιμα συστήματα στο τοπικό σας δίκτυο. + +
+ Διάλογος σύνδεσης + + + + + + Εμφανίζει τον διάλογο σύνδεσης. + + + +
+ + Μπορείτε επίσης να χρησιμοποιήσετε το πλήκτρο Find για να περιηγηθείτε σε διαθέσιμους υπολογιστές στο τοπικό δίκτυο. - - Some machines may require a secure connection. In this case, a - Password dialog will be displayed asking for the connection password. - If you check Remember this password, Vinagre will store - the secure information using GNOME Keyring Manager. - + Η διαθεσιμότητα του πλήκτρου Find εξαρτάται από το πρωτόκολλο που έχετε επιλέξει. Το Vinagre στηρίζεται στην υπηρεσία Avahi για την περιήγηση στο τοπικό σας δίκτυο. Σημειώστε επίσης ότι το Vinagre μπορεί να μεταγλωτιστεί χωρίς υποστήριξη Avahi. Σε αυτή την περίπτωση, αυτό το πλήκτρο δεν θα είανι διαθέσιμο. - - If the connection has been used previously, you can also access it by - - Machine - Recent connections... - . - + + Κάποια συστήματα μπορεί να απαιτούν μια ασφαλή σύνδεση. Σε αυτή την περίπτωση, ένας διάλογος Κωδικός πρόσβασης θα εμφανιστεί και θα ζητάει τον κωδικό πρόσβασης για την σύνδεση. Αν επιλέξετε το Απομνημόνευση αυτού του κωδικού, το Vinagre θα αποθηκεύσει τις πληροφορίες ασφαλώς με την χρήση του GNOME Keyring Manager. +
+ Διάλογος επικύρωσης + + + + + + Εμφανίζει τον διάλογο επικύρωσης. + + +
+ + Αν η σύνδεση έχει χρησιμοποιηθεί παλιότερα, μπορείτε επίσης να έχετε πρόσβαση σε αυτήν με την επιλογή ΣύστημαΠρόσφατες συνδέσεις.
- Opening a Remote Connection File - Some hosts distribute remote connection files (generally ending with - suffix ".vnc") instead of inform Host address and Port. To open a - remote connection file, choose - - CtrlO - Machine - Open - . The Select File dialog is displayed. - Select the file you want to open, then click on the Open button. - + Άνοιγμα ενός αρχείου απομακρυσμένης σύνδεσης + Κάποια συστήματα διανέμουν αρχεία απομακρυσμένης σύνδεσης (συνήθως καταλήγουν με την επέκταση ".vnc") αντί να δίνουν την διεύθυνση συστήματος και την πόρτα. Για να ανοίξετε ένα αρχείο απομακρυσμένης σύνδεσης, επιλέξτε CtrlOΣύστημαΆνοιγμα. Ο διάλογος Επιλογή αρχείου εμφανίζεται. Επιλέξτε το αρχείο που θέλετε να ανοίξετε, και μετά κάντε κλικ στο κουμπί Άνοιγμα. - You can also double-click on a remote connection file in the Nautilus - file manager to open it on the Vinagre window. - + Μπορείτε επίσης να κάνετε διπλό κλικ σε ένα αρχείο απομακρυσμένης σύνδεσης στον διαχειριστή αρχείων Ναυτίλο για να το ανοίξετε στο παράθυρο του Vinagre.
-
- -
- To Create a New Bookmark - To bookmark the currently viewed connection, choose - - CtrlD - Bookmarks - Add to Bookmarks - . The Saving to Bookmarks dialog is displayed. - Inform the name of the connection and click Ok. - -
- -
- To Remove a Bookmark - - To remove a bookmark, choose Remove from the context menu - of the bookmark in the Side Pane. - -
- -
- To Edit a Bookmark's Properties - - To edit a bookmark's properties, such as it's name and host, choose Edit - from the context menu of the bookmark in the Side Pane. - + +
+ Χρήση σελιδοδεικτών + Μπορείτε να έχετε πρόσβαση στις πιο συχνά χρησιμοποιούμενες συνδέσεις σας μέσω σελιδοδεικτών. Δείτε το Κεφάλαιο σελιδοδείκτες. +
+
- To Use Full Screen Mode - To zoom the Display Area to full screen mode, choose - - F11 - View - Full Screen - . To exit full screen mode, press F11 - or CtrlAlt. - + Για να χρησιμοποιήσετε την λειτουργία πλήρους οθόνης + Για να μεγεθύνετε την περιοχή εμφάνισης σε πλήρη οθόνη, επιλέξτε F11ΠροβολήΠλήρης οθόνη ή το αντίστοιχο πλήκτρο της γραμμής εργαλείων. + + Όταν είστε σε λειτουργία πλήρους οθόνης, μετακινήστε το ποντίκι στο επάνω μέρος της οθόνης, στο κέντρο της για να εμφανιστεί η κρυφή γραμμή εργαλείων, που έχει πλήκτρα για βγείτε από την λειτουργία πλήρους οθόνης, να κλείσετε την σύνδεση και άλλες επιλογές. +
- To Close a Connection - To close a connection, choose - - Machine - Close - . - + Για να κλείσετε μια σύνδεση + Για να κλείσετε μια σύνδεση, επιλέξτε ΣύστημαΚλείσιμο.
- To Take Screenshot - To take screenshot of the current remote desktop, choose - - Machine - Take Screenshot - or press the relative button in the toolbar. The - Save Screenshot dialog is displayed, click the - Save button to save the screenshot. - + Για να κάνετε λήψη στιγμιότυπου + Για να κάνετε λήψη στιγμιότυπου της τρέχουσας απομακρυσμένης επιφάνειας εργασίας, επιλέξτε ΣύστημαΛήψη στιγμιότυπου ή πατήστε το αντίστοιχο κουμπί στην εργαλειοθήκη. Ο διάλογος Αποθήκευση στιγμιότυπου εμφανίζεται, κάντε κλικ στο κουμπί Αποθήκευση για να αποθηκεύσετε το στιγμιότυπο. +
+ +
+ + +
+ Χρήση σελιδοδεικτών + +
+ Χρήση σελιδοδεικτών + Οι σελιδοδείκτες είναι ένα μέσο για να έχετε εύκολη πρόσβαση σε υπολογιστές στους οποίους συνδέεστε συχνά. Εμφανίζονται σε πλευρικό πίνακα ή στο μενού Σελιδοδείκτες. + +
+ Σελιδοδείκτες στον πλευρικό πίνακα + + + + + + Εμφανίζει σελιδοδείκτες στον πλευρικό πίνακα + + + +
+ + Καθώς μετακινείτε το ποντίκι στις καταχωρήσεις, ένα κείμενο υπόδειξης θα σας δείξει το όνομα εξυπηρετητή (hostname) της σύνδεσης. Για να συνδεθείτε σε έναν υπολογιστή, κάντε διπλό κλικ στην εγγραφή. + +
+ +
+ Για να δημιουργήσετε νέο σελιδοδείκτη + Για να προσθέσετε στους σελιδοδείκτες την τρέχουσα σύνδεση, επιλέξτε CtrlDΣελιδοδείκτεςΠροσθήκη στους σελιδοδείκτες. Ο διάλογος Αποθήκευση στους σελιδοδείκτες εμφανίζεται. Εισάγετε το όνομα της σύνδεσης και προαιρετικά άλλα στοιχεία, όπως τον κατάλογο και κάντε κλικ στο OK. + +
+ Αποθήκευση σελιδοδείκτη + + + + + + Εμφανίζει τον διάλογο αποθήκευση στους σελιδοδείκτες. + + + +
+ + + Μπορείτε να χρησιμοποιήσετε φακέλους για να οργανώσετε τους σελιδοδείκτες σας. Για να δημιουργήσετε έναν φάκελλο, κάντε δεξί κλικ στον πλευρικό πίνακα και επιλέξτε Νέος φάκελος από το αναδυόμενο μενού, ή πηγαίνετε στο μενού ΣελιδοδείκτεςΝέος φάκελος. + + +
+ +
+ Για να επεξεργαστείτε τις ιδιότητες ενός σελιδοδείκτη + Για να επεξεργαστείτε τις ιδιότητες ενός σελιδοδείκτη, όπως το όνομα του και τον εξυπηρετητή, επιλέξτε Επεξεργασία σελιδοδείκτη από το μενού περιεχομένων του σελιδοδείκτη στο πλαϊνό πλαίσιο. Ο ίδιος διάλογος που φαίνεται παραπάνω θα προβληθεί. + +
+ Επεξεργασία σελιδοδείκτη + + + + + + Επιλογή μενού περιεχομένων για την επεξεργασία σελιδοδείκτη + + + +
+ + Μπορείτε επίσης να επεξεργαστείτε έναν φάκελο. +
+ +
+ Για να αφαιρέσετε ένα σελιδοδείκτη + Για να αφαιρέσετε ένα σελιδοδείκτη, επιλέξτε Αφαίρεση από το μενού περιεχομένων του σελιδοδείκτη στο πλαϊνό πλαίσιο. + Μπορείτε επίσης να αφαιρέσετε έναν φάκελο. Σημειώστε ότι απομακρύνοντας έναν φάκελο θα αφαιρεθούν και όλες οι εγγραφές του. Ένας διάλογος επιβεβαίωσης θα εμφανισθεί.
+
+ Προτιμήσεις + Για να προσαρμόσετε το Vinagre, επιλέξτε ΕπεξεργασίαΠροτιμήσεις. Ο διάλογος Προτιμήσεις περιέχει τα εξής στοιχεία: + + + + Πάντα εμφάνιση καρτελών + + Επιλέξτε αυτή την λειτουργία για να κάνετε τις καρτέλλες πάντα ορατές, ακόμη και όταν μόνο μία σύνδεση είναι ενεργή. + + + + + Εμφάνιση συντομεύσεων πληκτρολογίου + + Επιλέγοντας αυτή την λειτουργία, οι συντομεύσεις πληκτρολογίου, όπως Ctrl+D και τα πλήκτρα άμεσης πρόσβασης, όπως Alt+M για πρόσβαση στο μενού του υπολογιστή, θα ενεργοποιηθούν. Αυτό σημαίνει ότι το Vinagre θα συλλαμβάνει αυτούς τους συνδυασμούς πλήκτρων αντί να τους στέλνει στον απομακρυσμένο υπολογιστή. Επειδή τις περισσότερες φορές θα εργάζεστε στον απομακρυσμένο υπολογιστή, αυτή η επιλογή είναι απενεργοποιημένη από προεπιλογή. + + + +
Περί diff -Nru vinagre-2.26.1/help/en_GB/vinagre.xml vinagre-2.29.1/help/en_GB/vinagre.xml --- vinagre-2.26.1/help/en_GB/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/en_GB/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +151,7 @@ vinagre - The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system to remotely control another computer. + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. Vinagre provides the following features: @@ -142,7 +161,13 @@ Store recently connections and allows to bookmark them. - Browse local network for VNC Servers. + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -154,7 +179,7 @@ -
+
Starting Vinagre You can start Vinagre in the following ways: @@ -172,8 +197,19 @@
- -
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
The Vinagre Window
Vinagre window @@ -218,26 +254,92 @@ Side Pane - The side pane contains a list of bookmarked connections. + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+
Using Vinagre
- To connect with a remote machine + To connect to a remote machine
- Entering Host address - To connect with a remote machine, choose CtrlNMachineConnect. The Connection Dialogue is displayed. Enter the Host and the Port of the connection and click the Connect button. You can also use the Find button to browse available machines on local network. + Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + - Some machines may require a secure connection. In this case, a Password dialogue will be displayed asking for the connection password. If you check Remember this password, Vinagre will store the secure information using GNOME Keyring Manager. + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ If the connection has been used previously, you can also access it by MachineRecent connections....
@@ -249,26 +351,32 @@ You can also double-click on a remote connection file in the Nautilus file manager to open it on the Vinagre window.
-
- -
- To Create a New Bookmark - To bookmark the currently-viewed connection, choose CtrlDBookmarksAdd to Bookmarks. The Saving to Bookmarks dialogue is displayed. Enter the name of the connection and click Ok. -
- -
- To Remove a Bookmark - To remove a bookmark, choose Remove from the context menu of the bookmark in the Side Pane. -
- -
- To Edit a Bookmark's Properties - To edit a bookmark's properties, such as its name and host, choose Edit from the context menu of the bookmark in the Side Pane. + +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
- To Use Full Screen Mode - To zoom the Display Area to full screen mode, choose F11ViewFull Screen. To exit full screen mode, press F11 or CtrlAlt. + To Use Full Screen Mode + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -284,9 +392,137 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ To Create a New Bookmark + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ To Edit a Bookmark's Properties + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ To Remove a Bookmark + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
About - Vinagre was written by Jonh Wendell wendell@bani.com.br. To find more information about Vinagre, please visit the Vinagre web page. + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + To report a bug or make a suggestion regarding this application you can file a bug in our bug tracker. This program is distributed under the terms of the GNU General Public licence as published by the Free Software Foundation; either version 2 of the Licence, or (at your option) any later version. A copy of this licence can be found at the GNU site, or in the file COPYING included with the source code of this program.
diff -Nru vinagre-2.26.1/help/es/es.po vinagre-2.29.1/help/es/es.po --- vinagre-2.26.1/help/es/es.po 2009-04-13 14:36:21.000000000 +0100 +++ vinagre-2.29.1/help/es/es.po 2009-10-26 13:44:11.000000000 +0000 @@ -1,11 +1,12 @@ -# translation of vinagre.help.HEAD.po to Español -# Jorge González , 2007, 2008. +# translation of vinagre-help.master.po to Español +# Jorge González , 2007, 2008, 2009. +# Jorge Gonzalez , 2009. msgid "" msgstr "" -"Project-Id-Version: vinagre.help.HEAD\n" -"POT-Creation-Date: 2008-12-11 20:47+0000\n" -"PO-Revision-Date: 2008-12-15 21:33+0100\n" -"Last-Translator: Jorge González \n" +"Project-Id-Version: vinagre-help.master\n" +"POT-Creation-Date: 2009-08-25 00:54+0000\n" +"PO-Revision-Date: 2009-08-29 16:25+0200\n" +"Last-Translator: Jorge Gonzalez \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -15,13 +16,75 @@ #. 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/vinagre.xml:180(None) +#: C/vinagre.xml:212(None) +#| msgid "" +#| "@@image: 'figures/vinagre-screenshot.png'; " +#| "md5=5ea2ba4ba469dadea877f19b6b33ced2" msgid "" "@@image: 'figures/vinagre-screenshot.png'; " -"md5=5ea2ba4ba469dadea877f19b6b33ced2" +"md5=dc88b591b3b8ed3a49335c5431806c13" msgstr "" "@@image: 'figures/vinagre-screenshot.png'; " -"md5=5ea2ba4ba469dadea877f19b6b33ced2" +"md5=dc88b591b3b8ed3a49335c5431806c13" + +#. 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/vinagre.xml:298(None) +msgid "" +"@@image: 'figures/vinagre-connect-dialog.png'; " +"md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" +msgstr "" +"@@image: 'figures/vinagre-connect-dialog.png'; " +"md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" + +#. 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/vinagre.xml:330(None) +#| msgid "" +#| "@@image: 'figures/vinagre-screenshot.png'; " +#| "md5=5ea2ba4ba469dadea877f19b6b33ced2" +msgid "" +"@@image: 'figures/vinagre-auth-needed.png'; " +"md5=3cd74cebc8d1d5e2c23b4419e28f6c11" +msgstr "" +"@@image: 'figures/vinagre-auth-needed.png'; " +"md5=3cd74cebc8d1d5e2c23b4419e28f6c11" + +#. 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/vinagre.xml:432(None) +#| msgid "" +#| "@@image: 'figures/vinagre-screenshot.png'; " +#| "md5=5ea2ba4ba469dadea877f19b6b33ced2" +msgid "" +"@@image: 'figures/vinagre-bookmarks-side-panel.png'; " +"md5=c657cdff0da28c73ac936227e490bb2e" +msgstr "" +"@@image: 'figures/vinagre-bookmarks-side-panel.png'; " +"md5=c657cdff0da28c73ac936227e490bb2e" + +#. 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/vinagre.xml:462(None) +msgid "" +"@@image: 'figures/vinagre-saving-bookmarks.png'; " +"md5=b99dbef848c5c0d487caecc320ed95de" +msgstr "" +"@@image: 'figures/vinagre-saving-bookmarks.png'; " +"md5=b99dbef848c5c0d487caecc320ed95de" + +#. 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/vinagre.xml:495(None) +#| msgid "" +#| "@@image: 'figures/vinagre-screenshot.png'; " +#| "md5=5ea2ba4ba469dadea877f19b6b33ced2" +msgid "" +"@@image: 'figures/vinagre-editing-bookmarks.png'; " +"md5=ac5097a12572cfce0561f0ca19bb1edb" +msgstr "" +"@@image: 'figures/vinagre-editing-bookmarks.png'; " +"md5=ac5097a12572cfce0561f0ca19bb1edb" #: C/vinagre.xml:25(title) msgid "Vinagre Manual" @@ -32,8 +95,9 @@ msgstr "Vinagre es un visor de escritorios remotos" #: C/vinagre.xml:32(year) -msgid "2007, 2008" -msgstr "2007, 2008" +#| msgid "2007, 2008" +msgid "2007, 2008, 2009" +msgstr "2007, 2008, 2009" #: C/vinagre.xml:33(holder) msgid "Jonh Wendell (wendell@bani.com.br)" @@ -162,117 +226,160 @@ msgid "vdepizzol@gmail.com" msgstr "vdepizzol@gmail.com" -#: C/vinagre.xml:80(revnumber) +#: C/vinagre.xml:65(firstname) +msgid "Jonh" +msgstr "Jonh" + +#: C/vinagre.xml:66(surname) +#| msgid "Jonh Wendell" +msgid "Wendell" +msgstr "Wendell" + +#: C/vinagre.xml:67(email) +#| msgid "Jonh Wendell (wendell@bani.com.br)" +msgid "wendell@bani.com.br" +msgstr "wendell@bani.com.br" + +#: C/vinagre.xml:86(revnumber) +#| msgid "0.2" +msgid "0.3" +msgstr "0.3" + +#: C/vinagre.xml:87(date) +#| msgid "2008-01-15" +msgid "2009-08-23" +msgstr "2009-08-23" + +#: C/vinagre.xml:89(para) +#| msgid "Jonh Wendell (wendell@bani.com.br)" +msgid "Jonh Wendell wendell@bani.com.br" +msgstr "Jonh Wendell wendell@bani.com.br" + +#: C/vinagre.xml:95(revnumber) msgid "0.2" msgstr "0.2" -#: C/vinagre.xml:81(date) +#: C/vinagre.xml:96(date) msgid "2008-01-15" msgstr "2008-01-15" -#: C/vinagre.xml:83(para) +#: C/vinagre.xml:98(para) msgid "Vinicius Depizzol vdepizzol@gmail.com" msgstr "Vinicius Depizzol vdepizzol@gmail.com" -#: C/vinagre.xml:89(revnumber) +#: C/vinagre.xml:104(revnumber) msgid "0.1" msgstr "0.1" -#: C/vinagre.xml:90(date) +#: C/vinagre.xml:105(date) msgid "2007-12-16" msgstr "2007-12-16" -#: C/vinagre.xml:92(para) +#: C/vinagre.xml:107(para) msgid "Jaap A. Haitsma jaap@haitsma.org" msgstr "Jaap A. Haitsma jaap@haitsma.org" -#: C/vinagre.xml:95(para) +#: C/vinagre.xml:110(para) msgid "Jaap A. Haitsma" msgstr "Jaap A. Haitsma" -#: C/vinagre.xml:101(title) +#: C/vinagre.xml:116(title) msgid "Feedback" msgstr "Comentarios" -#: C/vinagre.xml:102(para) +#: C/vinagre.xml:117(para) +#| msgid "" +#| "To report a bug or make a suggestion regarding this application you can " +#| "file a bug in our bug tracker." msgid "" "To report a bug or make a suggestion regarding the Vinagre application or " -"this manual, follow the directions in the Vinagre Contact " -"Page." -msgstr "" -"Para informar de un fallo, o hacer alguna sugerencia concerniente a Vinagre " -"o este manual, siga las instrucciones en la página de contacto de " -"Vinagre." +"this manual, please file a bug at GNOME bugzilla page." +msgstr "" +"Para informar de un fallo, o hacer alguna sugerencia concerniente a esta " +"aplicación, puede rellenar un informe de error en nuestra página de seguimiento de errores de GNOME." #: C/vinagre.xml:0(application) msgid "Vinagre" msgstr "Vinagre" -#: C/vinagre.xml:116(primary) +#: C/vinagre.xml:131(primary) msgid "remote desktop" msgstr "escritorio remoto" -#: C/vinagre.xml:122(title) +#: C/vinagre.xml:137(title) msgid "Introduction" msgstr "Introducción" -#: C/vinagre.xml:128(secondary) +#: C/vinagre.xml:143(secondary) msgid "Manual" msgstr "Manual" -#: C/vinagre.xml:129(tertiary) +#: C/vinagre.xml:144(tertiary) msgid "vinagre" msgstr "vinagre" -#: C/vinagre.xml:132(para) +#: C/vinagre.xml:147(para) +#| msgid "" +#| "The Vinagre application is a Remote Desktop Viewer for the " +#| "GNOME desktop that uses Virtual Network " +#| "Computing (VNC) system to remotely control another computer." msgid "" "The Vinagre application is a Remote Desktop Viewer for the GNOME " -"desktop that uses Virtual Network Computing (VNC) system to " -"remotely control another computer." +"desktop that uses Virtual Network Computing (VNC) system (and " +"possibly other protocols) to remotely control another computer." msgstr "" -"La aplicación Vinagre es un Visor de escritorios remotos para el " +"La aplicación Vinagre es un visor de escritorios remotos para el " "Escritorio GNOME que usa el sistema de computación " "virtual por red «Virtual Network Computing» (VNC) para controlar remotamente " "otro equipo." -#: C/vinagre.xml:133(para) +#: C/vinagre.xml:148(para) msgid "Vinagre provides the following features:" msgstr "" "Vinagre proporciona las siguientes " "características:" -#: C/vinagre.xml:136(para) +#: C/vinagre.xml:151(para) msgid "Connect to several machines at the same time." msgstr "Conectar con varias máquinas al mismo tiempo." -#: C/vinagre.xml:139(para) +#: C/vinagre.xml:154(para) msgid "Store recently connections and allows to bookmark them." msgstr "Almacenar las conexiones recientes y guardarlas en marcadores." -#: C/vinagre.xml:142(para) -msgid "Browse local network for VNC Servers." -msgstr "Examinar la red local para buscar servidores VNC." +#: C/vinagre.xml:157(para) +#| msgid "Browse local network for VNC Servers." +msgid "Browse local network for machines." +msgstr "Examinar la red local para buscar equipos." + +#: C/vinagre.xml:160(para) +msgid "Provide a GNOME Panel applet to quickly access your bookmarked machines." +msgstr "Proporciona una miniaplicación del panel de GNOME para acceder rápidamente a sus máquinas favoritas." + +#: C/vinagre.xml:163(para) +msgid "Extensible through its plugin structure." +msgstr "Extensible a través de su estructura de complementos." -#: C/vinagre.xml:150(title) +#: C/vinagre.xml:171(title) msgid "Getting Started" msgstr "Inicio" -#: C/vinagre.xml:155(title) +#: C/vinagre.xml:176(title) msgid "Starting Vinagre" msgstr "Iniciar Vinagre" -#: C/vinagre.xml:156(para) +#: C/vinagre.xml:177(para) msgid "You can start Vinagre in the following ways:" -msgstr "" -"Puede iniciar Vinagre de las siguientes formas:" +msgstr "Puede iniciar Vinagre de las siguientes formas:" -#: C/vinagre.xml:159(term) +#: C/vinagre.xml:180(term) msgid "Applications menu" msgstr "Menú Aplicaciones" -#: C/vinagre.xml:161(para) +#: C/vinagre.xml:182(para) msgid "" "Choose InternetRemote " "Desktop Viewer." @@ -280,27 +387,61 @@ "Elija InternetVisor de " "escritorios remotos." -#: C/vinagre.xml:165(term) +#: C/vinagre.xml:186(term) msgid "Command line" msgstr "Línea de comandos" -#: C/vinagre.xml:167(para) +#: C/vinagre.xml:188(para) msgid "Execute the following command: vinagre" msgstr "Ejecute el siguiente comando: vinagre" -#: C/vinagre.xml:174(title) +#: C/vinagre.xml:196(title) +#| msgid "Starting Vinagre" +msgid "Starting Vinagre from a command line" +msgstr "Iniciar Vinagre desde la línea de comandos" + +#: C/vinagre.xml:197(para) +msgid "" +"You can run Vinagre from a command line and " +"connect to a single machine or multiple machines. To connect to a machine " +"from a command line, type the following command, then press Return:" +msgstr "" +"Puede ejecutar Vinagre desde la línea de comandos y " +"conectarse a una sola máquina o a múltiples máquinas. Para conectarse con una máquina " +"desde la línea de comandos, escriba el siguiente comando, después pulse Intro:" + +#: C/vinagre.xml:198(replaceable) +msgid "hostname_or_ip_address" +msgstr "nombre-de-equipo_o_dirección_ip" + +#: C/vinagre.xml:198(command) +msgid "vinagre " +msgstr "vinagre " + +#: C/vinagre.xml:199(para) +msgid "" +"For more information on how to run Vinagre from a " +"command line, see the unix manual page for Vinagre, Vinagre1." +msgstr "" +"Para obtener más información acerca de cómo ejecutar Vinagre desde " +"la línea de comandos consulte la página del manual UNIX para Vinagre, Vinagre1." + +#: C/vinagre.xml:206(title) msgid "The Vinagre Window" msgstr "La ventana de Vinagre" -#: C/vinagre.xml:176(title) +#: C/vinagre.xml:208(title) msgid "Vinagre window" msgstr "Ventana de Vinagre" -#: C/vinagre.xml:182(phrase) +#: C/vinagre.xml:214(phrase) msgid "Shows vinagre main window." msgstr "Muestra la ventana principal de Vinagre." -#: C/vinagre.xml:188(para) +#: C/vinagre.xml:220(para) msgid "" "The Vinagre window contains the following " "elements:" @@ -308,11 +449,11 @@ "La ventana de Vinagre contiene los siguientes " "elementos:" -#: C/vinagre.xml:193(term) +#: C/vinagre.xml:225(term) msgid "Menubar" msgstr "Barra de menú" -#: C/vinagre.xml:195(para) +#: C/vinagre.xml:227(para) msgid "" "The menus on the menubar contain all of the commands you need to work with " "remote connections in Vinagre." @@ -320,11 +461,11 @@ "Los menús en la barra de menú contienen todos los comandos que necesita para " "trabajar con conexiones remotas en Vinagre." -#: C/vinagre.xml:199(term) +#: C/vinagre.xml:231(term) msgid "Toolbar" msgstr "Barra de herramientas" -#: C/vinagre.xml:201(para) +#: C/vinagre.xml:233(para) msgid "" "The toolbar contains a subset of the most used commands that you can access " "from the menubar." @@ -332,11 +473,11 @@ "La barra de herramientas contiene un juego de los comandos más usados a los " "que puede acceder desde la barra de menú." -#: C/vinagre.xml:205(term) +#: C/vinagre.xml:237(term) msgid "Display Area" msgstr "Área de visualización" -#: C/vinagre.xml:207(para) +#: C/vinagre.xml:239(para) msgid "" "The display area contains a list of tabs with the connected machines and its " "remote desktops." @@ -344,11 +485,11 @@ "El área de visualización contiene una lista de solapas con las máquinas " "conectadas y sus escritorios remotos." -#: C/vinagre.xml:211(term) +#: C/vinagre.xml:243(term) msgid "Statusbar" msgstr "Barra de estado" -#: C/vinagre.xml:213(para) +#: C/vinagre.xml:245(para) msgid "" "The statusbar displays information about current Vinagre activity and contextual information about the menu items." @@ -357,62 +498,165 @@ "Vinagre así como información contextual acerca de " "los elementos del menú." -#: C/vinagre.xml:217(term) +#: C/vinagre.xml:249(term) msgid "Side Pane" msgstr "Panel lateral" -#: C/vinagre.xml:219(para) -msgid "The side pane contains a list of bookmarked connections." -msgstr "El panel lateral contiene una lista de conexiones en los marcadores." +#: C/vinagre.xml:251(para) +#| msgid "The side pane contains a list of bookmarked connections." +msgid "" +"The side pane contains a list of bookmarked connections and (if available) a " +"list of auto-discovered network machines." +msgstr "" +"El panel lateral contiene una lista de conexiones en los marcadores y (si está disponible) " +"una lista de las máquinas de red autodescubiertas." + +#: C/vinagre.xml:259(title) +#| msgid "Starting Vinagre" +msgid "Some notes about Vinagre" +msgstr "Algunas notas acerca de Vinagre" + +#: C/vinagre.xml:260(para) +msgid "" +"As a tool to access other machines, Vinagre behaves slightly different than " +"other GNOME applications in its default " +"installation." +msgstr "" +"Como herramienta para acceder a otras máquinas, Vinagre se comporta de forma diferente " +"a otras aplicaciones de GNOME en su instalación predeterminada." + +#: C/vinagre.xml:261(para) +msgid "" +"Vinagre comes with menu accelerators and keyboard shortcuts disabled by " +"default. This avoids keys being intercepted by Vinagre when you wanted to " +"send those keys to the remote machine." +msgstr "" +"Vinagre tiene los aceleradores de teclado y las combinaciones de teclas desactivadas " +"de forma predeterminada. Esto evita que Vinagre intercepte teclas cuando envía esas " +"teclas a la máquina remota." + +#: C/vinagre.xml:262(para) +msgid "" +"For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by " +"default." +msgstr "" +"Por ejemplo, la combinación de teclas para cerrar una solapa es Ctrl+W " +"pero esa combinación de teclas se enviará a la máquina remota de forma predeterminada." -#: C/vinagre.xml:228(title) +#: C/vinagre.xml:263(para) +#| msgid "" +#| "To close a connection, choose MachineClose." +msgid "" +"If you want to change this behavior, go to Vinagre preferences in " +"EditPreferences." +msgstr "" +"Si quiere cambiar este comportamiento vaya a las propiedades de Vinagre en " +"EditarPreferencias." + +#: C/vinagre.xml:275(title) msgid "Using Vinagre" msgstr "Uso de Vinagre" -#: C/vinagre.xml:231(title) -msgid "To connect with a remote machine" +#: C/vinagre.xml:278(title) +#| msgid "To connect with a remote machine" +msgid "To connect to a remote machine" msgstr "Conectar con una máquina remota" -#: C/vinagre.xml:234(title) -msgid "Informing Host address" -msgstr "Informar de la dirección del equipo" - -#: C/vinagre.xml:235(para) +#: C/vinagre.xml:281(title) +#| msgid "Informing Host address" +msgid "Informing a host address" +msgstr "Informar de la dirección de un equipo" + +#: C/vinagre.xml:282(para) +#| msgid "" +#| "To connect with a remote machine, choose " +#| "CtrlNMachineConnect. The Connection Dialog is " +#| "displayed. Inform the Host and the Port of the connection and click the Connect " +#| "button. You can also use the Find button to browse " +#| "available machines on local network." msgid "" "To connect with a remote machine, choose " "CtrlNMachineConnect. The Connection Dialog is " -"displayed. Inform the Host and the PortProtocol and the Host of the connection and click the Connect " -"button. You can also use the Find button to browse " -"available machines on local network." +"button. You will see a bunch of options depending on what protocol you have " +"selected." msgstr "" "Para conectar con una máquina remota elija " "CtrlNMáquinaConectar. Se mostrará el diálogo Diálogo de " -"conexión. Introduzca el Equipo y el " -"Puerto de la conexión y pulse el botón " -"Conectar. También puede usar el botón " -"Buscar para examinar las máquinas disponibles en su " -"red local." - -#: C/vinagre.xml:246(para) -msgid "" -"Some machines may require a secure connection. In this case, a " -"Password dialog will be displayed asking for the " -"connection password. If you check Remember this password. Introduzca el Protocolo y el Equipo para " +"la conexión y pulse el botón Conectar. Verá un conjunto de opciones " +"dependiendo del protocolo que haya seleccionado." + +#: C/vinagre.xml:294(title) +msgid "Connect dialog" +msgstr "Diálogo de conexión" + +#: C/vinagre.xml:300(phrase) +msgid "Shows the connect dialog." +msgstr "Muestra el diálogo de conexión." + +#: C/vinagre.xml:306(para) +msgid "" +"You can also use the Find button to browse available " +"machines on local network." +msgstr "También puede usar el botón Buscar para examinar las máquinas disponibles en su red local." + +#: C/vinagre.xml:310(para) +msgid "" +"The availabity of the Find button depends on the " +"protocol you have selected. Vinagre relies on Avahi service to browse for machines in your local network. Also, " +"notice that Vinagre can be compiled without Avahi " +"support. In this case, this button will not be available." +msgstr "" +"La disponibilidad del botón Buscar depende del " +"protocolo seleccionado. Vinagre depende del servicio Avahi " +"para examinar máquinas en su red local. Note también que Vinagre se puede " +"compilar sin soporte para Avahi. En este caso, el botón " +"no estará disponible." + +#: C/vinagre.xml:318(para) +#| msgid "" +#| "Some machines may require a secure connection. In this case, a " +#| "Password dialog will be displayed asking for the " +#| "connection password. If you check Remember this password, Vinagre will store the secure " +#| "information using GNOME Keyring Manager." +msgid "" +"Some machines may require a secure connection. In this case, an " +"Authentication dialog will be displayed asking for the " +"credentials. The type of credentials depends on the server. It may be a " +"password and an username. If you check Remember this credential, Vinagre will store the secure " "information using GNOME Keyring Manager." msgstr "" "Algunas máquinas pueden requerir una conexión segura. En este caso se " -"presentará un diálogo de Contraseña preguntando por la " -"contraseña de la conexión. Si selecciona Recordar esta contraseñaAutenticación/guilabel> preguntando por las " +"credenciales. El tipo de credenciales dependen del servidor. Puede ser una contraseña " +"y un nombre de usuario. Si selecciona Recordar esta credenciales, Vinagre almacenará la información de " "seguridad usando el Depósito de claves de GNOME." -#: C/vinagre.xml:253(para) +#: C/vinagre.xml:326(title) +msgid "Authentication dialog" +msgstr "Diálogo de autenticación" + +#: C/vinagre.xml:332(phrase) +msgid "Shows the authentication dialog." +msgstr "Muestra el diálogo de autenticación." + +#: C/vinagre.xml:337(para) msgid "" "If the connection has been used previously, you can also access it by " "MachineRecent connections...MáquinaConexiones " "recientes." -#: C/vinagre.xml:263(title) +#: C/vinagre.xml:347(title) msgid "Opening a Remote Connection File" msgstr "Abrir un archivo en una conexión remota" -#: C/vinagre.xml:264(para) +#: C/vinagre.xml:348(para) msgid "" "Some hosts distribute remote connection files (generally ending with suffix " "\".vnc\") instead of inform Host address and Port. To open a remote " @@ -445,7 +689,7 @@ "archivo. Seleccione el archivo que quiera abrir, después pulse el " "botón Abrir." -#: C/vinagre.xml:276(para) +#: C/vinagre.xml:360(para) msgid "" "You can also double-click on a remote connection file in the " "Nautilus file manager to open it on the " @@ -455,75 +699,55 @@ "gestor de archivos Nautilus para abrirlo en la " "ventana de Vinagre." -#: C/vinagre.xml:284(title) -msgid "To Create a New Bookmark" -msgstr "Crear un marcador nuevo" - -#: C/vinagre.xml:285(para) -msgid "" -"To bookmark the currently viewed connection, choose " -"CtrlDBookmarksAdd to " -"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and click " -"Ok." -msgstr "" -"Para añadir la conexión actualmente mostrada a los marcadores, elija " -"CtrlDMarcadoresAñadir " -"marcador. Se mostrará el diálogo " -"Guardando a los marcadores. Introduzca el nombre de la " -"conexión y pulse Aceptar." - -#: C/vinagre.xml:296(title) -msgid "To Remove a Bookmark" -msgstr "Quitar un marcador" +#: C/vinagre.xml:367(title) C/vinagre.xml:419(title) C/vinagre.xml:422(title) +msgid "Using Bookmarks" +msgstr "Usar los marcadores" -#: C/vinagre.xml:297(para) +#: C/vinagre.xml:368(para) msgid "" -"To remove a bookmark, choose Remove from the " -"context menu of the bookmark in the Side Pane." -msgstr "" -"Para quitar un marcador, elija Quitar del menú " -"contextual del marcador en el panel lateral." - -#: C/vinagre.xml:304(title) -msgid "To Edit a Bookmark's Properties" -msgstr "Editar las propiedades de un marcador" - -#: C/vinagre.xml:305(para) -msgid "" -"To edit a bookmark's properties, such as it's name and host, choose " -"Edit from the context menu of the bookmark in the " -"Side Pane." +"You can access your mostly used connections through bookmarks. See the Bookmarks chapter." msgstr "" -"Para editar las propiedades de un marcador, tales como su nombre y el " -"equipo, elija Editar del menú contextual del " -"marcador en el panel lateral." +"Puede acceder a sus conexiones más usadas a través de los marcadores. Consulte el " +"Capítulo de los marcadores." -#: C/vinagre.xml:312(title) +#: C/vinagre.xml:376(title) msgid "To Use Full Screen Mode" msgstr "Usar el modo a pantalla completa" -#: C/vinagre.xml:313(para) +#: C/vinagre.xml:377(para) +#| msgid "" +#| "To zoom the Display Area to full screen mode, choose " +#| "F11ViewFull Screen. To exit full " +#| "screen mode, press F11 or CtrlAlt." msgid "" "To zoom the Display Area to full screen mode, choose " "F11ViewFull Screen. To exit full " -"screen mode, press F11 or CtrlAlt." +"guimenu>Full Screen or the " +"corresponding tool bar button." msgstr "" "Para ampliar el área de visualización al modo a pantalla completa, elija " "F11VerPantalla completa. Para " -"salir del modo a pantalla completa, pulse F11 o " -"CtrlAlt." +"guimenu>Pantalla completa o el correspondiente " +"botón de la barra de herramientas." -#: C/vinagre.xml:324(title) +#: C/vinagre.xml:385(para) +msgid "" +"While in full screen mode, move the mouse to the top center of the screen to " +"show a hidden tool bar, which has buttons to leave full screen mode, close " +"the connection and other options." +msgstr "" +"Cuando esté en modo a pantalla completa mueva el ratón a la parte superior central " +"de la pantalla para mostrar una barra de herramientas oculta que tiene botones para salir " +"del modo a pantalla completa, cerrar la conexión y otras opciones." + +#: C/vinagre.xml:394(title) msgid "To Close a Connection" msgstr "Cerrar una conexión" -#: C/vinagre.xml:325(para) +#: C/vinagre.xml:395(para) msgid "" "To close a connection, choose MachineClose." @@ -531,11 +755,11 @@ "Para cerrar una conexión, elija MáquinaCerrar." -#: C/vinagre.xml:334(title) +#: C/vinagre.xml:404(title) msgid "To Take Screenshot" msgstr "Capturar la pantalla" -#: C/vinagre.xml:335(para) +#: C/vinagre.xml:405(para) msgid "" "To take screenshot of the current remote desktop, choose " "MachineTake ScreenshotGuardar la captura de pantalla, " "pulse el botón Guardar para guardarla." -#: C/vinagre.xml:349(title) +#: C/vinagre.xml:423(para) +msgid "" +"Bookmarks are a resource to keep around machines you access frequently. They " +"are visible at side panel or in the Bookmarks menu." +msgstr "" +"Los marcadores son recursos para tener cerca máquinas a las que accede con frecuencia. Están " +"visibles en el panel lateral o en el menú Marcadores." + +#: C/vinagre.xml:428(title) +msgid "Bookmarks at side panel" +msgstr "Los marcadores en el panel lateral" + +#: C/vinagre.xml:434(phrase) +msgid "Shows bookmarks at side panel." +msgstr "Muestra los marcadores en el panel lateral." + +#: C/vinagre.xml:440(para) +msgid "" +"As you move the mouse around the entries, a tooltip will show you the " +"hostname of the connection. To connect to a machine, just double click on a " +"entry." +msgstr "" +"Según mueva el ratón sobre las entradas un consejo le mostrará el " +"nombre del equipo de la conexión. Para conectarse a la máquina simplemente pulse " +"dos veces sobre una entrada." + +#: C/vinagre.xml:447(title) +msgid "To Create a New Bookmark" +msgstr "Crear un marcador nuevo" + +#: C/vinagre.xml:448(para) +#| msgid "" +#| "To bookmark the currently viewed connection, choose " +#| "CtrlDBookmarksAdd to " +#| "Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and " +#| "click Ok." +msgid "" +"To bookmark the currently viewed connection, choose " +"CtrlDBookmarksAdd to " +"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and " +"optionally other data, such as the folder and click Save." +msgstr "" +"Para añadir la conexión actualmente mostrada a los marcadores, elija " +"CtrlDMarcadoresAñadir " +"marcador. Se mostrará el diálogo " +"Guardando a los marcadores. Introduzca el nombre de la " +"conexión y el resto de datos, tales como la carpeta, y pulse Guardar." + +#: C/vinagre.xml:458(title) +msgid "Saving a bookmark" +msgstr "Guardando a los marcadores" + +#: C/vinagre.xml:464(phrase) +msgid "Shows the Saving to Bookmarks dialog." +msgstr "Muestra el diálogo Guardando a los marcadores." + +#: C/vinagre.xml:471(para) +msgid "" +"You can use folders to organize your bookmarks. To create a folder, right " +"click in the side panel and choose the option New Folder " +"in the context menu, or go to menu BookmarksNew Folder." +msgstr "" +"Puede usar carpetas para organizar sus marcadores. Para crear una carpeta pulse en " +"el panel lateral y elija la opción Carpeta nueva en el menú contextual " +"o vaya al menú MarcadoresCarpeta nueva." + +#: C/vinagre.xml:484(title) +msgid "To Edit a Bookmark's Properties" +msgstr "Editar las propiedades de un marcador" + +#: C/vinagre.xml:485(para) +#| msgid "" +#| "To edit a bookmark's properties, such as it's name and host, choose " +#| "Edit from the context menu of the bookmark in " +#| "the Side Pane." +msgid "" +"To edit a bookmark's properties, such as it's name and host, choose " +"Edit bookmark from the context menu of the " +"bookmark in the Side Pane. The same dialog as shown above will be displayed." +msgstr "" +"Para editar las propiedades de un marcador, tales como su nombre y el " +"equipo, elija Editar marcador del menú contextual del " +"marcador en el panel lateral. Se mostrará el mismo diálogo que el superior." + +#: C/vinagre.xml:491(title) +msgid "Editing a bookmark" +msgstr "Editar un marcador" + +#: C/vinagre.xml:497(phrase) +msgid "Context menu option to edit a bookmark" +msgstr "Opción del menú contextual para editar un marcador" + +#: C/vinagre.xml:503(para) +msgid "You can also edit a folder." +msgstr "También puede editar una carpeta." + +#: C/vinagre.xml:507(title) +msgid "To Remove a Bookmark" +msgstr "Quitar un marcador" + +#: C/vinagre.xml:508(para) +#| msgid "" +#| "To remove a bookmark, choose Remove from the " +#| "context menu of the bookmark in the Side Pane." +msgid "" +"To remove a bookmark, choose Remove from bookmarks from " +"the context menu of the bookmark in the Side Pane." +msgstr "" +"Para quitar un marcador elija Quitar de los marcadores del menú " +"contextual del marcador en el panel lateral." + +#: C/vinagre.xml:512(para) +msgid "" +"You can also remove a folder. Notice that removing a folder will remove all " +"its entries. A confirmation dialog will be shown." +msgstr "También puede quitar una carpeta. Note que al quitar una carpeta quitará todas sus entradas. Se mostrará un diálogo de confirmación." + +#: C/vinagre.xml:518(title) +msgid "Preferences" +msgstr "Preferencias" + +#: C/vinagre.xml:519(para) +#| msgid "" +#| "To close a connection, choose MachineClose." +msgid "" +"To configure Vinagre, choose " +"EditPreferences. The Preferences dialog contains the " +"following items:" +msgstr "Para configurar Vinagre elija EditarPreferencias. El diálogo Preferencias contiene los siguientes elementos de menú." + +#: C/vinagre.xml:523(guilabel) +msgid "Always show tabs" +msgstr "Mostrar siempre las solapas" + +#: C/vinagre.xml:525(para) +msgid "" +"Select this option to make the tabs always visible, even when only one " +"connection is active." +msgstr "Seleccione esta opción para hacer que las solapas siempre estén visibles, incluso cuando sólo hay una conexión activa." + +#: C/vinagre.xml:530(guilabel) +msgid "Show menu shortcuts" +msgstr "Mostrar los atajos de menú" + +#: C/vinagre.xml:532(para) +msgid "" +"By selecting this option, keyboard shortcuts, like Ctrl+D and menu accelerators, like Alt+M to access " +"the Machine menu, will be enabled. This means that Vinagre will catch those " +"key combinations, instead of sending them to the remote machine. Because " +"most of the time you will be working on the remote machine, this option " +"comes disabled by default." +msgstr "" +"Seleccionando esta opción, los aceleradores de teclado tales como Ctrl+D " +"y los aceleradores de menú tales como Alt+M para acceder al menú Máquina, " +"se activarán. Esto sifnifica que Vinagre capturará esas combinaciones en lugar de enviarlas a " +"la máquina remota. Ya que pasará la mayor parte del tiempo trabajando en la máquina remota, esta " +"opción está desactivada de forma predeterminada." + +#: C/vinagre.xml:543(title) msgid "About" msgstr "Acerca de" -#: C/vinagre.xml:350(para) +#: C/vinagre.xml:544(para) +#| msgid "" +#| "Vinagre was written by Jonh Wendell wendell@bani.com.br. " +#| "To find more information about Vinagre, please visit the Vinagre web page." msgid "" "Vinagre was written by Jonh Wendell wendell@bani.com.br. To " "find more information about Vinagre, please visit the VinagreVinagre web page." msgstr "" "John Wendell wendell@bani.com.br escribió Vinagre. Para " -"obtener más información acerca de Vinagre, visite la página web de " +"obtener más información acerca de Vinagre, visite la página web de " "Vinagre." -#: C/vinagre.xml:356(para) +#: C/vinagre.xml:549(para) msgid "" "To report a bug or make a suggestion regarding this application you can file " "a bug in our página de seguimiento de errores." -#: C/vinagre.xml:362(para) +#: C/vinagre.xml:555(para) msgid "" "This program is distributed under the terms of the GNU General Public " "license as published by the Free Software Foundation; either version 2 of " @@ -596,3 +993,4 @@ #: C/vinagre.xml:0(None) msgid "translator-credits" msgstr "Jorge González , 2007-2008." + diff -Nru vinagre-2.26.1/help/es/vinagre.xml vinagre-2.29.1/help/es/vinagre.xml --- vinagre-2.26.1/help/es/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/es/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +145,7 @@ vinagre - La aplicación Vinagre es un Visor de escritorios remotos para el Escritorio GNOME que usa el sistema de computación virtual por red «Virtual Network Computing» (VNC) para controlar remotamente otro equipo. + La aplicación Vinagre es un visor de escritorios remotos para el Escritorio GNOME que usa el sistema de computación virtual por red «Virtual Network Computing» (VNC) para controlar remotamente otro equipo. Vinagre proporciona las siguientes características: @@ -142,7 +155,13 @@ Almacenar las conexiones recientes y guardarlas en marcadores. - Examinar la red local para buscar servidores VNC. + Examinar la red local para buscar equipos. + + + Proporciona una miniaplicación del panel de GNOME para acceder rápidamente a sus máquinas favoritas. + + + Extensible a través de su estructura de complementos. @@ -154,7 +173,7 @@ -
+
Iniciar Vinagre Puede iniciar Vinagre de las siguientes formas: @@ -172,8 +191,19 @@
- -
+ + +
+ Iniciar Vinagre desde la línea de comandos + Puede ejecutar Vinagre desde la línea de comandos y conectarse a una sola máquina o a múltiples máquinas. Para conectarse con una máquina desde la línea de comandos, escriba el siguiente comando, después pulse Intro: + vinagre nombre-de-equipo_o_dirección_ip + Para obtener más información acerca de cómo ejecutar Vinagre desde la línea de comandos consulte la página del manual UNIX para Vinagre, Vinagre1. +
+ + + + +
La ventana de Vinagre
Ventana de Vinagre @@ -218,12 +248,21 @@ Panel lateral - El panel lateral contiene una lista de conexiones en los marcadores. + El panel lateral contiene una lista de conexiones en los marcadores y (si está disponible) una lista de las máquinas de red autodescubiertas.
+ +
+ Algunas notas acerca de Vinagre + Como herramienta para acceder a otras máquinas, Vinagre se comporta de forma diferente a otras aplicaciones de GNOME en su instalación predeterminada. + Vinagre tiene los aceleradores de teclado y las combinaciones de teclas desactivadas de forma predeterminada. Esto evita que Vinagre intercepte teclas cuando envía esas teclas a la máquina remota. + Por ejemplo, la combinación de teclas para cerrar una solapa es Ctrl+W pero esa combinación de teclas se enviará a la máquina remota de forma predeterminada. + Si quiere cambiar este comportamiento vaya a las propiedades de Vinagre en EditarPreferencias. +
+
@@ -233,11 +272,40 @@ Conectar con una máquina remota
- Informar de la dirección del equipo - Para conectar con una máquina remota elija CtrlNMáquinaConectar. Se mostrará el diálogo Diálogo de conexión. Introduzca el Equipo y el Puerto de la conexión y pulse el botón Conectar. También puede usar el botón Buscar para examinar las máquinas disponibles en su red local. + Informar de la dirección de un equipo + Para conectar con una máquina remota elija CtrlNMáquinaConectar. Se mostrará el diálogo Diálogo de conexión. Introduzca el Protocolo y el Equipo para la conexión y pulse el botón Conectar. Verá un conjunto de opciones dependiendo del protocolo que haya seleccionado. + +
+ Diálogo de conexión + + + + + + Muestra el diálogo de conexión. + + + +
+ + También puede usar el botón Buscar para examinar las máquinas disponibles en su red local. - Algunas máquinas pueden requerir una conexión segura. En este caso se presentará un diálogo de Contraseña preguntando por la contraseña de la conexión. Si selecciona Recordar esta contraseña, Vinagre almacenará la información de seguridad usando el Depósito de claves de GNOME. + La disponibilidad del botón Buscar depende del protocolo seleccionado. Vinagre depende del servicio Avahi para examinar máquinas en su red local. Note también que Vinagre se puede compilar sin soporte para Avahi. En este caso, el botón no estará disponible. + + Algunas máquinas pueden requerir una conexión segura. En este caso se presentará un diálogo de Autenticación/guilabel> preguntando por las credenciales. El tipo de credenciales dependen del servidor. Puede ser una contraseña y un nombre de usuario. Si selecciona Recordar esta credenciales, Vinagre almacenará la información de seguridad usando el Depósito de claves de GNOME. +
+ Diálogo de autenticación + + + + + + Muestra el diálogo de autenticación. + + +
+ Si la conexión ya se ha usado anteriormente, también puede acceder a ella a través de MáquinaConexiones recientes.
@@ -249,26 +317,20 @@ También puede pulsar dos veces en el archivo de la conexión remota en el gestor de archivos Nautilus para abrirlo en la ventana de Vinagre.
-
- -
- Crear un marcador nuevo - Para añadir la conexión actualmente mostrada a los marcadores, elija CtrlDMarcadoresAñadir marcador. Se mostrará el diálogo Guardando a los marcadores. Introduzca el nombre de la conexión y pulse Aceptar. -
- -
- Quitar un marcador - Para quitar un marcador, elija Quitar del menú contextual del marcador en el panel lateral. -
- -
- Editar las propiedades de un marcador - Para editar las propiedades de un marcador, tales como su nombre y el equipo, elija Editar del menú contextual del marcador en el panel lateral. + +
+ Usar los marcadores + Puede acceder a sus conexiones más usadas a través de los marcadores. Consulte el Capítulo de los marcadores. +
+
- Usar el modo a pantalla completa - Para ampliar el área de visualización al modo a pantalla completa, elija F11VerPantalla completa. Para salir del modo a pantalla completa, pulse F11 o CtrlAlt. + Usar el modo a pantalla completa + Para ampliar el área de visualización al modo a pantalla completa, elija F11VerPantalla completa o el correspondiente botón de la barra de herramientas. + + Cuando esté en modo a pantalla completa mueva el ratón a la parte superior central de la pantalla para mostrar una barra de herramientas oculta que tiene botones para salir del modo a pantalla completa, cerrar la conexión y otras opciones. +
@@ -284,9 +346,105 @@
+
+ Usar los marcadores + +
+ Usar los marcadores + Los marcadores son recursos para tener cerca máquinas a las que accede con frecuencia. Están visibles en el panel lateral o en el menú Marcadores. + +
+ Los marcadores en el panel lateral + + + + + + Muestra los marcadores en el panel lateral. + + + +
+ + Según mueva el ratón sobre las entradas un consejo le mostrará el nombre del equipo de la conexión. Para conectarse a la máquina simplemente pulse dos veces sobre una entrada. + +
+ +
+ Crear un marcador nuevo + Para añadir la conexión actualmente mostrada a los marcadores, elija CtrlDMarcadoresAñadir marcador. Se mostrará el diálogo Guardando a los marcadores. Introduzca el nombre de la conexión y el resto de datos, tales como la carpeta, y pulse Guardar. + +
+ Guardando a los marcadores + + + + + + Muestra el diálogo Guardando a los marcadores. + + + +
+ + + Puede usar carpetas para organizar sus marcadores. Para crear una carpeta pulse en el panel lateral y elija la opción Carpeta nueva en el menú contextual o vaya al menú MarcadoresCarpeta nueva. + + +
+ +
+ Editar las propiedades de un marcador + Para editar las propiedades de un marcador, tales como su nombre y el equipo, elija Editar marcador del menú contextual del marcador en el panel lateral. Se mostrará el mismo diálogo que el superior. + +
+ Editar un marcador + + + + + + Opción del menú contextual para editar un marcador + + + +
+ + También puede editar una carpeta. +
+ +
+ Quitar un marcador + Para quitar un marcador elija Quitar de los marcadores del menú contextual del marcador en el panel lateral. + También puede quitar una carpeta. Note que al quitar una carpeta quitará todas sus entradas. Se mostrará un diálogo de confirmación. +
+ +
+ +
+ Preferencias + Para configurar Vinagre elija EditarPreferencias. El diálogo Preferencias contiene los siguientes elementos de menú. + + + + Mostrar siempre las solapas + + Seleccione esta opción para hacer que las solapas siempre estén visibles, incluso cuando sólo hay una conexión activa. + + + + + Mostrar los atajos de menú + + Seleccionando esta opción, los aceleradores de teclado tales como Ctrl+D y los aceleradores de menú tales como Alt+M para acceder al menú Máquina, se activarán. Esto sifnifica que Vinagre capturará esas combinaciones en lugar de enviarlas a la máquina remota. Ya que pasará la mayor parte del tiempo trabajando en la máquina remota, esta opción está desactivada de forma predeterminada. + + + +
+
Acerca de - John Wendell wendell@bani.com.br escribió Vinagre. Para obtener más información acerca de Vinagre, visite la página web de Vinagre. + John Wendell wendell@bani.com.br escribió Vinagre. Para obtener más información acerca de Vinagre, visite la página web de Vinagre. Para informar de un fallo, o hacer alguna sugerencia concerniente a esta aplicación, puede rellenar un informe de error en nuestra página de seguimiento de errores. Este programa se distribuye bajo los términos de la Licencia Pública General GNU tal como la publica la Free Software Foundation; en cualquiera de las versiones 2 de la Licencia o (a su elección) cualquier versión posterior. Puede encontrar una copia de esta licencia en este enlace, o en el archivo COPYING incluido con el código fuente de este programa.
diff -Nru vinagre-2.26.1/help/fr/vinagre.xml vinagre-2.29.1/help/fr/vinagre.xml --- vinagre-2.26.1/help/fr/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/fr/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +151,7 @@ vinagre - Vinagre est un visionneur de bureau distant pour le bureau GNOME. Il utilise le système VNC (Virtual Network Computing) pour se connecter à distance à un autre ordinateur. + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. Vinagre présente les fonctionnalités suivantes : @@ -142,7 +161,13 @@ rappel des connexions récentes et possibilité de les enregistrer dans des signets ; - navigation dans le réseau local pour découvrir des serveurs VNC. + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -154,7 +179,7 @@ -
+
Démarrage de Vinagre Vous pouvez lancer Vinagre au moyen des procédures suivantes : @@ -172,8 +197,19 @@
- -
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
La fenêtre de Vinagre
Fenêtre de Vinagre @@ -218,26 +254,92 @@ Panneau latéral - Le panneau latéral contient une liste des connexions enregistrées dans des signets. + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+
Utilisation de Vinagre
- Connexion à un ordinateur distant + To connect to a remote machine
- Indication de l'adresse de l'hôte - Pour vous connecter à un ordinateur distant, choisissez CtrlNMachineSe connecter. La Boîte de dialogue de connexion apparaît. Complétez les champs Hôte et Port de la connexion, puis cliquez sur le bouton Se connecter. Vous pouvez aussi utiliser le bouton Rechercher pour parcourir les machines disponibles sur le réseau local. + Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + - Certains ordinateurs pourraient exiger une connexion sécurisée. Dans ce cas, une boîte de dialogue Mot de passe apparaît pour vous demander de saisir le mot de passe de la connexion. Si vous cochez la case Se souvenir du mot de passe, Vinagre enregistre cette donnée secrète à l'aide du gestionnaire de trousseaux de GNOME. + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ Si la connexion a déjà été effectuée auparavant, vous pouvez également y accéder par le menu MachineConnexions récentes.
@@ -249,26 +351,32 @@ Vous pouvez aussi double-cliquer sur un fichier de connexion distante dans le gestionnaire de fichiers Nautilus pour l'ouvrir dans la fenêtre de Vinagre.
-
- -
- Création d'un signet - Pour créer un signet à partir de la connexion actuellement ouverte, choisissez CtrlDSignetsAjouter aux signets. La boîte de dialogue Enregistrement dans les signets apparaît. Complétez le nom de la connexion, puis cliquez sur Valider. -
- -
- Suppression d'un signet - Pour supprimer un signet, choisissez Retirer des signets dans le menu contextuel du signet concerné, dans le panneau latéral. -
- -
- Modification des propriétés d'un signet - Pour modifier les propriétés d'un signet, comme par exemple son nom ou l'hôte, choisissez Éditer le signet dans le menu contextuel du signet, dans le panneau latéral. + +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
- Mode plein écran - Pour agrandir la zone d'affichage en mode plein écran, choisissez F11AffichagePlein écran. Pour sortir du mode plein écran, appuyez sur F11 ou CtrlAlt. + Mode plein écran + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -284,9 +392,137 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ Création d'un signet + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ Modification des propriétés d'un signet + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ Suppression d'un signet + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
À propos - Vinagre a été écrit par Jonh Wendell wendell@bani.com.br. Pour trouver plus d'informations au sujet de Vinagre, consultez le site Web de Vinagre. + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + Pour rapporter une anomalie ou émettre une suggestion sur cette application, vous pouvez utiliser notre outil de suivi d'anomalies. Ce programme est distribué selon les termes de la licence publique générale GNU telle que publiée par la Free Software Foundation, selon la version 2 de la licence, ou (à votre choix) n'importe quelle version ultérieure. Vous pouvez trouver une copie de cette licence en suivant ce lien, ou dans le fichier COPYING distribué avec le code source de ce programme.
diff -Nru vinagre-2.26.1/help/it/it.po vinagre-2.29.1/help/it/it.po --- vinagre-2.26.1/help/it/it.po 2009-04-13 14:36:21.000000000 +0100 +++ vinagre-2.29.1/help/it/it.po 2009-10-26 13:44:11.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 2008, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the vinagre package. # Andrea Zagli , 2008 -# Milo Casagrande , 2009 # +# Milo Casagrande , 2009, 2009. msgid "" msgstr "" "Project-Id-Version: vinagre-manual\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-11 15:07+0000\n" -"PO-Revision-Date: 2009-03-11 20:50+0100\n" +"POT-Creation-Date: 2009-04-20 18:02+0000\n" +"PO-Revision-Date: 2009-08-16 17:16+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -53,7 +53,13 @@ "Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " "of the GFDL at this link or " "in the file COPYING-DOCS distributed with this manual." -msgstr "Questo documento può essere copiato, distribuito o modificato in conformità con i termini della GNU Free Documentation License (GFDL) Versione 1.1 o delle versioni successive pubblicate dalla Free Software Foundation senza sezioni invariabili, frontespizi e testi di copertina. Una copia della GFDL si può trovare a questo collegamento o nel file COPYING-DOCS distribuito con questo manuale." +msgstr "" +"Questo documento può essere copiato, distribuito o modificato in conformità " +"con i termini della GNU Free Documentation License (GFDL) Versione 1.1 o " +"delle versioni successive pubblicate dalla Free Software Foundation senza " +"sezioni invariabili, frontespizi e testi di copertina. Una copia della GFDL " +"si può trovare a questo collegamento o nel file COPYING-DOCS distribuito con questo manuale." #: C/vinagre.xml:12(para) msgid "" @@ -197,8 +203,8 @@ msgstr "" "Per segnalare un errore o dare un suggerimento riguardo l'applicazione " "Vinagre o questo manuale, seguire le istruzioni nella Pagina dei contatti di " -"Vinagre." +"www.gnome.org/projects/vinagre/\" type=\"http\">Pagina dei contatti " +"di Vinagre." #: C/vinagre.xml:0(application) msgid "Vinagre" @@ -346,7 +352,7 @@ "application> activity and contextual information about the menu items." msgstr "" "La barra di stato visualizza informazioni sull'attività corrente di " -"Vinagre e informazioni contestuali sulle voci di " +"Vinagre e informazioni contestuali sulle voci di " "menù." #: C/vinagre.xml:217(term) @@ -427,7 +433,15 @@ "guimenu>Open. The Select " "File dialog is displayed. Select the file you want to open, then " "click on the Open button." -msgstr "Alcuni host distribuiscono i file di connessione remota (generalmente finiscono con il suffisso \".vnc\") invece di inserire la porta e l'indirizzo dell'host. Per aprire un file di connessione remota, scegliere CtrlOMacchinaApri. Il dialogo Seleziona file viene visualizzato. Selezionare il file che si vuole aprire e poi fare clic sul pulsante Apri." +msgstr "" +"Alcuni host distribuiscono i file di connessione remota (generalmente " +"finiscono con il suffisso \".vnc\") invece di inserire la porta e " +"l'indirizzo dell'host. Per aprire un file di connessione remota, scegliere " +"CtrlOMacchinaApri. Il dialogo Seleziona file " +"viene visualizzato. Selezionare il file che si vuole aprire e poi fare clic " +"sul pulsante Apri." #: C/vinagre.xml:276(para) msgid "" diff -Nru vinagre-2.26.1/help/it/vinagre.xml vinagre-2.29.1/help/it/vinagre.xml --- vinagre-2.26.1/help/it/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/it/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +151,7 @@ vinagre - L'applicazione Vinagre è un visualizzatore di desktop remoti per lo GNOME desktop che utilizza il sistema Virtual Network Computing (VNC) per controllare remotamente un altro computer. + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. Vinagre dispone delle seguenti caratteristiche: @@ -142,7 +161,13 @@ Archivia connessioni recenti e permette di crearne dei segnalibri. - Esplorazione della rete locale per Server VNC. + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -154,7 +179,7 @@ -
+
Avviare Vinagre Si può avviare Vinagre nei seguenti modi: @@ -172,8 +197,19 @@
- -
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
La finestra di Vinagre
Finestra di Vinagre @@ -212,32 +248,98 @@ Barra di stato - La barra di stato visualizza informazioni sull'attività corrente di Vinagre e informazioni contestuali sulle voci di menù. + La barra di stato visualizza informazioni sull'attività corrente di Vinagre e informazioni contestuali sulle voci di menù. Riquadro laterale - Il riquadro laterale contiene un elenco di segnalibri di connessioni. + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+
Utilizzare Vinagre
- Connettersi a una macchina remota + To connect to a remote machine
- Inserimento dell'indirizzo dell'host - Per connettersi a una macchina remota, scegliere CtrlNMacchinaConnetti. Il dialogo Connessione viene visualizzato. Inserire l'Host e la Porta della connessione e fare clic sul pulsante Connetti. Si può anche utilizzare il pulsante Trova per esplorare le macchine disponibili sulla rete locale. + Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + - Alcune macchine possono richiedere una connessione sicura. In questo caso, un dialogo Password verrà visualizzato e richiederà la password della connessione. Selezionando Ricordare questa password, Vinagre archivierà le informazioni sicure utilizzando Gestore di portachiavi GNOME. + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ Se la connessione è stata utilizzate precedentemente, si può anche accedervi da MacchinaConnessioni recenti....
@@ -249,26 +351,32 @@ Si può anche fare doppio clic su un file di connessione remota nel gestore file Nautilus per aprirlo nella finestra di Vinagre.
-
- -
- Creare un nuovo segnalibro - Per creare un segnalibro della connessione correntemente visualizzata, scegliere CtrlDSegnalibriAggiungi ai segnalibri. Il dialogo Salvataggio nei segnalibri viene visualizzato. Inserire il nome della connessione e fare clic su OK. -
- -
- Rimuovere un segnalibro - Per eliminare un segnalibro, scegliere Rimuovi dal menù contestuale del segnalibro nel riquadro laterale. -
- -
- Modificare le proprietà di un segnalibro - Per modificare le proprietà di un segnalibro, come il suo nome o l'host, scegliere Modifica del menù contestuale del segnalibro nel riquadro laterale. + +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
- Utilizzare la modalità a schermo intero - Per ingrandire l'Area di visualizzazione a schermo intero, scegliere F11VisualizzaSchermo intero. Per uscire dalla modalità a schermo intero, premere F11 o CtrlAlt. + Utilizzare la modalità a schermo intero + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -284,9 +392,137 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ Creare un nuovo segnalibro + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ Modificare le proprietà di un segnalibro + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ Rimuovere un segnalibro + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
Informazioni - Vinagre è stato scritto da Jonh Wendell wendell@bani.com.br. Per trovare maggiori informazioni su Vinagre, visitare le pagina web di Vinagre. + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + Per segnalare un errore o dare un suggerimento riguardo questa applicazione si può compilare un errore nel tracker di errori. Questo programma è distribuito secondo i termini della licenza GNU General Public License, come pubblicata dalla Free Software Foundation; versione 2 della licenza, o (a scelta) una versione più recente. Una copia di questa licenza può essere trovata sul sito di GNU, o nel file COPYING includo con il codice sorgente di questo programma.
diff -Nru vinagre-2.26.1/help/Makefile.am vinagre-2.29.1/help/Makefile.am --- vinagre-2.26.1/help/Makefile.am 2009-03-19 19:29:38.000000000 +0000 +++ vinagre-2.29.1/help/Makefile.am 2009-08-25 01:57:00.000000000 +0100 @@ -6,7 +6,13 @@ DOC_INCLUDES = DOC_FIGURES = \ - figures/vinagre-screenshot.png + figures/vinagre-screenshot.png \ + figures/vinagre-auth-needed.png \ + figures/vinagre-bookmarks-side-panel.png \ + figures/vinagre-connect-dialog.png \ + figures/vinagre-editing-bookmarks.png \ + figures/vinagre-saving-bookmarks.png -DOC_LINGUAS = ca cs de el en_GB es fr it oc pt pt_BR sq sv th +DOC_LINGUAS = ca cs de el en_GB es fr it oc pl pt pt_BR sq sv th zh_CN +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/help/Makefile.in vinagre-2.29.1/help/Makefile.in --- vinagre-2.26.1/help/Makefile.in 2009-04-13 14:35:36.000000000 +0100 +++ vinagre-2.29.1/help/Makefile.in 2009-10-26 13:35:25.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,8 +40,9 @@ ################################################################################ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -65,13 +67,22 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLET_CFLAGS = @APPLET_CFLAGS@ APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ @@ -117,29 +128,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -147,6 +139,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -157,6 +150,7 @@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ @@ -166,10 +160,12 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -179,11 +175,23 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ @@ -235,6 +243,7 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) @@ -244,6 +253,7 @@ $(DOC_LINGUAS)) _DOC_ABS_SRCDIR = @abs_srcdir@ +_xml2po_mode = $(if $(DOC_ID),mallard,docbook) @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ @@ -277,14 +287,16 @@ ################################################################################ _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) +_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page)) _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) _DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) _DOC_C_DOCS = \ $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ - $(_DOC_C_MODULE) + $(_DOC_C_PAGES) $(_DOC_C_MODULE) _DOC_C_DOCS_NOENT = \ - $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) + $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \ + $(_DOC_C_PAGES) _DOC_C_FIGURES = $(if $(DOC_FIGURES), \ $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ @@ -300,12 +312,16 @@ ############################################################################### -_DOC_POFILES = $(if $(DOC_MODULE), \ +_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) _DOC_LC_MODULES = $(if $(DOC_MODULE), \ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) +_DOC_LC_PAGES = \ + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \ + $(lc)/$(notdir $(page)) )) + _DOC_LC_INCLUDES = \ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ $(lc)/$(notdir $(inc)) )) @@ -317,7 +333,7 @@ $(lc)/$(notdir $(doc)) )) _DOC_LC_DOCS = \ - $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \ + $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) _DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ @@ -337,14 +353,20 @@ _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) -_clean_dir = $(if $(DOC_MODULE),clean-doc-dir) +_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir) +_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE)) DOC_MODULE = vinagre DOC_ENTITIES = legal.xml DOC_INCLUDES = DOC_FIGURES = \ - figures/vinagre-screenshot.png + figures/vinagre-screenshot.png \ + figures/vinagre-auth-needed.png \ + figures/vinagre-bookmarks-side-panel.png \ + figures/vinagre-connect-dialog.png \ + figures/vinagre-editing-bookmarks.png \ + figures/vinagre-saving-bookmarks.png -DOC_LINGUAS = ca cs de el en_GB es fr it oc pt pt_BR sq sv th +DOC_LINGUAS = ca cs de el en_GB es fr it oc pl pt pt_BR sq sv th zh_CN all: all-am .SUFFIXES: @@ -352,14 +374,14 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu help/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu help/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -377,6 +399,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -406,13 +429,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -443,6 +470,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -461,6 +489,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -469,18 +499,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -577,6 +617,10 @@ DOC_MODULE ?= +DOC_ID ?= + +DOC_PAGES ?= + DOC_ENTITIES ?= DOC_INCLUDES ?= @@ -593,6 +637,7 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` +_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl @@ -637,16 +682,16 @@ done; \ if ! test -f $@; then \ echo "(cd $(dir $@) && \ - $(_xml2po) -e $$docs > $(notdir $@).tmp && \ + $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ (cd $(dir $@) && \ - $(_xml2po) -e $$docs > $(notdir $@).tmp && \ + $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ else \ echo "(cd $(dir $@) && \ - $(_xml2po) -e -u $(notdir $@) $$docs)"; \ + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \ (cd $(dir $@) && \ - $(_xml2po) -e -u $(notdir $@) $$docs); \ + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ fi # FIXME: fix the dependancy @@ -655,15 +700,16 @@ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) if ! test -d $(dir $@); then mkdir $(dir $@); fi if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \ + if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \ (cd $(dir $@) && \ - $(_xml2po) -e -p \ - "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \ + $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -e -o $@ $^ + $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) @@ -675,6 +721,8 @@ $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ $(_DOC_HTML_ALL) $(_DOC_POFILES) +################################################################################ + .PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) @@ -693,7 +741,7 @@ rm -f "$$lc/.xml2po.mo"; \ fi; \ done -clean-doc-dir: +clean-doc-dir: clean-doc-lc @for lc in C $(_DOC_REAL_LINGUAS); do \ for dir in `find $$lc -depth -type d`; do \ if ! test $$dir -ef $(srcdir)/$$dir; then \ @@ -716,10 +764,12 @@ $(_clean_omf) $(_clean_dsk) \ $(_clean_lc) $(_clean_dir) -.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk -doc-dist-hook: \ - $(if $(DOC_MODULE),dist-doc-docs) \ - $(if $(_DOC_C_FIGURES),dist-doc-figs) \ +################################################################################ + +.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk +doc-dist-hook: \ + $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \ + $(if $(_DOC_C_FIGURES),dist-doc-figs) \ $(if $(_DOC_OMF_IN),dist-doc-omf) # $(if $(_DOC_DSK_IN),dist-doc-dsk) @@ -765,9 +815,12 @@ echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" +################################################################################ + .PHONY: check-doc-docs check-doc-omf check: \ $(if $(DOC_MODULE),check-doc-docs) \ + $(if $(DOC_ID),check-doc-pages) \ $(if $(_DOC_OMF_IN),check-doc-omf) check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) @@ -783,15 +836,33 @@ xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ done +check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES) + for lc in C $(_DOC_REAL_LINGUAS); do \ + if test -f "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(DOC_PAGES); do \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + done; \ + done + check-doc-omf: $(_DOC_OMF_ALL) @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ done +################################################################################ + .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk + install-data-local: \ - $(if $(DOC_MODULE),install-doc-docs) \ + $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \ $(if $(_DOC_HTML_ALL),install-doc-html) \ $(if $(_DOC_C_FIGURES),install-doc-figs) \ $(if $(_DOC_OMF_IN),install-doc-omf) @@ -799,42 +870,46 @@ install-doc-docs: @for lc in C $(_DOC_REAL_LINGUAS); do \ - echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ - $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \ + echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ + $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ done @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \ + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ if ! test -d "$$docdir"; then \ echo "$(mkinstalldirs) $$docdir"; \ $(mkinstalldirs) "$$docdir"; \ fi; \ - echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ - $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ done install-doc-figs: @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ for lc in C $(_DOC_REAL_LINGUAS); do \ + figsymlink=false; \ if test -f "$$lc/$$fig"; then \ figfile="$$lc/$$fig"; \ elif test -f "$(srcdir)/$$lc/$$fig"; then \ figfile="$(srcdir)/$$lc/$$fig"; \ - elif test -f "C/$$fig"; then \ - figfile="C/$$fig"; \ else \ - figfile="$(srcdir)/C/$$fig"; \ + figsymlink=true; \ fi; \ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ + figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \ if ! test -d "$$figdir"; then \ echo "$(mkinstalldirs) $$figdir"; \ $(mkinstalldirs) "$$figdir"; \ fi; \ figbase=`echo $$fig | sed -e 's/^.*\///'`; \ - echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ - $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + if $$figsymlink; then \ + echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ + ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ + else \ + echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ + $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ + fi; \ done; \ done @@ -842,22 +917,24 @@ echo install-html install-doc-omf: - $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE) + $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir) @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ - echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \ + echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \ done @if test "x$(_ENABLE_SK)" = "xtrue"; then \ - echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ - scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ + echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ + scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ fi; install-doc-dsk: echo install-dsk +################################################################################ + .PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk uninstall-local: \ - $(if $(DOC_MODULE),uninstall-doc-docs) \ + $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \ $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ $(if $(_DOC_OMF_IN),uninstall-doc-omf) @@ -865,26 +942,29 @@ uninstall-doc-docs: @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ - echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ - rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ done uninstall-doc-figs: @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ - echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ - rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ + echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ done; uninstall-doc-omf: @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ if test "x$(_ENABLE_SK)" = "xtrue"; then \ - echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ fi; \ - echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ + echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ + rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ done dist-hook: doc-dist-hook + +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru vinagre-2.26.1/help/oc/vinagre.xml vinagre-2.29.1/help/oc/vinagre.xml --- vinagre-2.26.1/help/oc/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/oc/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -197,7 +212,7 @@ vinagre - The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system to remotely control another computer. + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. Vinagre provides the following features: @@ -207,7 +222,13 @@ Store recently connections and allows to bookmark them. - Browse local network for VNC Servers. + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -219,7 +240,7 @@ -
+
Aviar Vinagre You can start Vinagre in the following ways: @@ -237,8 +258,19 @@
- -
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
The Vinagre Window
Fenèstra de Vinagre @@ -284,40 +316,92 @@ Panèl lateral - The side pane contains a list of bookmarked connections. + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+
Utilizar Vinagre
- To connect with a remote machine + To connect to a remote machine
- Informing Host address + Informing a host address To connect with a remote machine, choose CtrlN Machine Connect . The Connection Dialog is displayed. - Inform the Host and the Port of - the connection and click the Connect button. You can - also use the Find button to browse available machines on local network. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. - Some machines may require a secure connection. In this case, a - Password dialog will be displayed asking for the connection password. - If you check Remember this password, Vinagre will store - the secure information using GNOME Keyring Manager. + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ If the connection has been used previously, you can also access it by @@ -346,46 +430,32 @@
+ +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
-
- To Create a New Bookmark - To bookmark the currently viewed connection, choose +
+ To Use Full Screen Mode + To zoom the Display Area to full screen mode, choose - CtrlD - Bookmarks - Add to Bookmarks - . The Saving to Bookmarks dialog is displayed. - Inform the name of the connection and click Ok. - -
- -
- To Remove a Bookmark - - To remove a bookmark, choose Remove from the context menu - of the bookmark in the Side Pane. - -
- -
- To Edit a Bookmark's Properties - - To edit a bookmark's properties, such as it's name and host, choose Edit - from the context menu of the bookmark in the Side Pane. + F11 + View + Full Screen + or the corresponding tool bar button. -
- -
- To Use Full Screen Mode - To zoom the Display Area to full screen mode, choose - - F11 - View - Full Screen - . To exit full screen mode, press F11 - or CtrlAlt. - + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -413,13 +483,136 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ To Create a New Bookmark + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ To Edit a Bookmark's Properties + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ To Remove a Bookmark + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
A prepaus de Vinagre was written by Jonh Wendell wendell@bani.com.br. To find more information about Vinagre, please visit the - - Vinagre web page. + Vinagre web page. To report a bug or make a suggestion regarding this application you can file Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/pl/figures/vinagre-screenshot.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/pl/figures/vinagre-screenshot.png differ diff -Nru vinagre-2.26.1/help/pl/pl.po vinagre-2.29.1/help/pl/pl.po --- vinagre-2.26.1/help/pl/pl.po 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/help/pl/pl.po 2009-10-26 13:44:11.000000000 +0000 @@ -0,0 +1,349 @@ +# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Aviary.pl +# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz +# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: +# gnomepl@aviary.pl +# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Łukasz Jernaś, 2009. +msgid "" +msgstr "" +"Project-Id-Version: Dokumentacja Vinagre\n" +"POT-Creation-Date: 2009-03-15 19:08+0100\n" +"PO-Revision-Date: 2009-04-29 22:09+0100\n" +"Last-Translator: wadim dziedzic \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Language: pl_PL\n" +"X-Poedit-Language: Polish\n" +"X-Poedit-Country: POLAND\n" +"X-Poedit-SourceCharset: utf-8\n" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: ../C/vinagre.xml:180(None) +msgid "@@image: 'figures/vinagre-screenshot.png'; md5=5ea2ba4ba469dadea877f19b6b33ced2" +msgstr "@@image: 'figures/vinagre-screenshot.png'; md5=cd3cc52d558dbc5b47f1d23e7782230a" + +#: ../C/vinagre.xml:25(title) +msgid "Vinagre Manual" +msgstr "Podręcznik użytkownika Vinagre" + +#: ../C/vinagre.xml:27(para) +msgid "Vinagre is a Remote Desktop Viewer" +msgstr "Program Vinagre jest przeglądarką zdalnych pulpitów" + +#: ../C/vinagre.xml:32(year) +msgid "2007, 2008" +msgstr "2007, 2008" + +#: ../C/vinagre.xml:33(holder) +msgid "Jonh Wendell (wendell@bani.com.br)" +msgstr "Jonh Wendell (wendell@bani.com.br)" + +#: ../C/vinagre.xml:49(publishername) +msgid "Jonh Wendell" +msgstr "Jonh Wendell" + +#: ../C/vinagre.xml:59(firstname) +msgid "Vinicius" +msgstr "Vinicius" + +#: ../C/vinagre.xml:60(surname) +msgid "Depizzol" +msgstr "Depizzol" + +#: ../C/vinagre.xml:61(email) +msgid "vdepizzol@gmail.com" +msgstr "vdepizzol@gmail.com" + +#: ../C/vinagre.xml:80(revnumber) +msgid "0.2" +msgstr "0.2" + +#: ../C/vinagre.xml:81(date) +msgid "2008-01-15" +msgstr "2008-01-15" + +#: ../C/vinagre.xml:83(para) +msgid "Vinicius Depizzol vdepizzol@gmail.com" +msgstr "Vinicius Depizzol vdepizzol@gmail.com" + +#: ../C/vinagre.xml:89(revnumber) +msgid "0.1" +msgstr "0.1" + +#: ../C/vinagre.xml:90(date) +msgid "2007-12-16" +msgstr "2007-12-16" + +#: ../C/vinagre.xml:92(para) +msgid "Jaap A. Haitsma jaap@haitsma.org" +msgstr "Jaap A. Haitsma jaap@haitsma.org" + +#: ../C/vinagre.xml:95(para) +msgid "Jaap A. Haitsma" +msgstr "Jaap A. Haitsma" + +#: ../C/vinagre.xml:101(title) +msgid "Feedback" +msgstr "Opinie" + +#: ../C/vinagre.xml:102(para) +msgid "To report a bug or make a suggestion regarding the Vinagre application or this manual, follow the directions in the Vinagre Contact Page." +msgstr "Aby zgłosić błąd lub sugestię dotyczącą programu Vinagre lub niniejszego podręcznika, proszę postępować zgodnie ze wskazówkami opublikowanymi na stronie programu Vinagre." + +#: ../C/vinagre.xml:116(primary) +msgid "remote desktop" +msgstr "zdalny pulpit" + +#: ../C/vinagre.xml:122(title) +msgid "Introduction" +msgstr "Wstęp" + +#: ../C/vinagre.xml:128(secondary) +msgid "Manual" +msgstr "Podręcznik użytkownika" + +#: ../C/vinagre.xml:129(tertiary) +msgid "vinagre" +msgstr "vinagre" + +#: ../C/vinagre.xml:132(para) +msgid "The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system to remotely control another computer." +msgstr "Program Vinagre jest przeglądarką zdalnych pulpitów dla środowiska GNOME, która korzysta z systemu Virtual Network Computing (VNC) do zdalnej kontroli nad innym komputerem." + +#: ../C/vinagre.xml:133(para) +msgid "Vinagre provides the following features:" +msgstr "Program Vinagre pozwala na:" + +#: ../C/vinagre.xml:136(para) +msgid "Connect to several machines at the same time." +msgstr "łączenie się z wieloma komputerami równocześnie," + +#: ../C/vinagre.xml:139(para) +msgid "Store recently connections and allows to bookmark them." +msgstr "zapamiętywanie ostatnich połączeń i zapisywanie zakładek do nich," + +#: ../C/vinagre.xml:142(para) +msgid "Browse local network for VNC Servers." +msgstr "przeglądanie lokalnej sieci w poszukiwaniu serwerów VNC." + +#: ../C/vinagre.xml:150(title) +msgid "Getting Started" +msgstr "Pierwsze kroki" + +#: ../C/vinagre.xml:155(title) +msgid "Starting Vinagre" +msgstr "Uruchamianie programu Vinagre" + +#: ../C/vinagre.xml:156(para) +msgid "You can start Vinagre in the following ways:" +msgstr "Program Vinagre można uruchomić w jeden z następujących sposobów:" + +#: ../C/vinagre.xml:159(term) +msgid "Applications menu" +msgstr "wybierając z menu Programy" + +#: ../C/vinagre.xml:161(para) +msgid "Choose InternetRemote Desktop Viewer." +msgstr "polecenie InternetPrzeglądarka zdalnych pulpitów," + +#: ../C/vinagre.xml:165(term) +msgid "Command line" +msgstr "wpisując w oknie terminala" + +#: ../C/vinagre.xml:167(para) +msgid "Execute the following command: vinagre" +msgstr "polecenie vinagre." + +#: ../C/vinagre.xml:174(title) +msgid "The Vinagre Window" +msgstr "Główne okno programu Vinagre" + +#: ../C/vinagre.xml:176(title) +msgid "Vinagre window" +msgstr "Główne okno programu Vinagre" + +#: ../C/vinagre.xml:182(phrase) +msgid "Shows vinagre main window." +msgstr "Przedstawia główne okno programu Vinagre." + +#: ../C/vinagre.xml:188(para) +msgid "The Vinagre window contains the following elements:" +msgstr "Główne okno programu Vinagre zawiera następujące elementy:" + +#: ../C/vinagre.xml:193(term) +msgid "Menubar" +msgstr "pasek menu" + +#: ../C/vinagre.xml:195(para) +msgid "The menus on the menubar contain all of the commands you need to work with remote connections in Vinagre." +msgstr "Pasek menu zawiera wszystkie polecenia potrzebne do pracy ze zdalnymi połączeniami w programie Vinagre." + +#: ../C/vinagre.xml:199(term) +msgid "Toolbar" +msgstr "pasek narzędziowy" + +#: ../C/vinagre.xml:201(para) +msgid "The toolbar contains a subset of the most used commands that you can access from the menubar." +msgstr "Pasek narzędziowy zawiera podzbiór poleceń, które można wywołać z paska menu." + +#: ../C/vinagre.xml:205(term) +msgid "Display Area" +msgstr "obszar wyświetlania" + +#: ../C/vinagre.xml:207(para) +msgid "The display area contains a list of tabs with the connected machines and its remote desktops." +msgstr "Obszar wyświetlania zawiera listę kart połączonych komputerów i ich zdalnych pulpitów." + +#: ../C/vinagre.xml:211(term) +msgid "Statusbar" +msgstr "pasek stanu" + +#: ../C/vinagre.xml:213(para) +msgid "The statusbar displays information about current Vinagre activity and contextual information about the menu items." +msgstr "Pasek stanu wyświetla informacje o obecnym stanie programu Vinagre, jak również informacje o poleceniach menu." + +#: ../C/vinagre.xml:217(term) +msgid "Side Pane" +msgstr "panel boczny" + +#: ../C/vinagre.xml:219(para) +msgid "The side pane contains a list of bookmarked connections." +msgstr "Panel boczny zawiera listę utworzonych zakładek do połączeń." + +#: ../C/vinagre.xml:228(title) +msgid "Using Vinagre" +msgstr "Korzystanie z programu Vinagre" + +#: ../C/vinagre.xml:231(title) +msgid "To connect with a remote machine" +msgstr "Łączenie ze zdalnym komputerem" + +#: ../C/vinagre.xml:234(title) +msgid "Informing Host address" +msgstr "Podawanie adresu komputera" + +#: ../C/vinagre.xml:235(para) +msgid "To connect with a remote machine, choose CtrlNMachineConnect. The Connection Dialog is displayed. Inform the Host and the Port of the connection and click the Connect button. You can also use the Find button to browse available machines on local network." +msgstr "Aby połączyć się ze zdalnym komputerem, należy wybrać z menu polecenie CtrlNKomputerPołącz. Zostanie wyświetlone okno połączenia. Należy podać nazwę i port komputera w polu Komputer, a następnie nacisnąć Połącz. Można również nacisnąć przycisk Znajdź, aby wyszukać komputery dostępne w sieci lokalnej." + +#: ../C/vinagre.xml:246(para) +msgid "Some machines may require a secure connection. In this case, a Password dialog will be displayed asking for the connection password. If you check Remember this password, Vinagre will store the secure information using GNOME Keyring Manager." +msgstr "Niektóre komputery mogą wymagać nawiązania bezpiecznego połączenia. W tym wypadku zostanie wyświetlone okno dialogowe z prośbą o podanie hasła. Po zaznaczeniu pola wyboru Zapamiętanie hasła program Vinagre zapisze hasło używając bazy kluczy środowiska GNOME." + +#: ../C/vinagre.xml:253(para) +msgid "If the connection has been used previously, you can also access it by MachineRecent connections...." +msgstr "Jeśli połączenie było wcześniej używane, można uzyskać do niego dostęp poprzez skorzystanie z menu KomputerOstatnie połączenia." + +#: ../C/vinagre.xml:263(title) +msgid "Opening a Remote Connection File" +msgstr "Otwieranie pliku zdalnego połączenia" + +#: ../C/vinagre.xml:264(para) +msgid "Some hosts distribute remote connection files (generally ending with suffix \".vnc\") instead of inform Host address and Port. To open a remote connection file, choose CtrlOMachineOpen. The Select File dialog is displayed. Select the file you want to open, then click on the Open button." +msgstr "Niektóre komputery dostarczają pliki zdalnego pulpitu (często zakończone końcówką \".vnc\") i nie wymagają podawania adresu i portu komputera. W celu otwarcia takiego pliku, należy wybrać z menu polecenie CtrlOKomputerOtwórz, po czym zostanie wyświetlone okno dialogowe Wybór pliku. Należy wybrać plik, który ma zostać otwarty, a następnie nacisnąć przycisk Otwórz." + +#: ../C/vinagre.xml:276(para) +msgid "You can also double-click on a remote connection file in the Nautilus file manager to open it on the Vinagre window." +msgstr "Można również kliknąć dwukrotnie plik zdalnego pulpitu w menedżerze plików Nautilus, aby wyświetlić go w oknie programu Vinagre" + +#: ../C/vinagre.xml:284(title) +msgid "To Create a New Bookmark" +msgstr "Tworzenie nowej zakładki" + +#: ../C/vinagre.xml:285(para) +msgid "To bookmark the currently viewed connection, choose CtrlDBookmarksAdd to Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and click Ok." +msgstr "W celu dodania zakładki do aktualnie wyświetlanego, należy wybrać z menu CtrlDZakładkiDodaj do zakładek. Zostanie wyświetlone okno dialogowe Zapisywanie do zakładek, w którym należy wpisać nazwę połączenia i nacisnąć przycisk Ok." + +#: ../C/vinagre.xml:296(title) +msgid "To Remove a Bookmark" +msgstr "Usuwanie zakładki" + +#: ../C/vinagre.xml:297(para) +msgid "To remove a bookmark, choose Remove from the context menu of the bookmark in the Side Pane." +msgstr "W celu usunięcia zakładki, należy wybrać z jej menu kontekstowego polecenie Usuń z zakładek." + +#: ../C/vinagre.xml:304(title) +msgid "To Edit a Bookmark's Properties" +msgstr "Modyfikacja zakładki" + +#: ../C/vinagre.xml:305(para) +msgid "To edit a bookmark's properties, such as it's name and host, choose Edit from the context menu of the bookmark in the Side Pane." +msgstr "W celu modyfikacji właściwości zakładki, takich jak nazwa i adres komputera, należy wybrać z jej menu kontekstowego polecenie Modyfikuj zakładkę." + +#: ../C/vinagre.xml:312(title) +msgid "To Use Full Screen Mode" +msgstr "Tryb pełnego ekranu" + +#: ../C/vinagre.xml:313(para) +msgid "To zoom the Display Area to full screen mode, choose F11ViewFull Screen. To exit full screen mode, press F11 or CtrlAlt." +msgstr "W celu powiększenia obszaru wyświetlania tak, aby zajmował pełny ekran, należy wybrać z menu polecenie F11WidokPełny ekran. W celu opuszczenia trybu pełnoekranowego, należy nacisnąć klawisz F11 lub skorzystać ze skrótu klawiszowego CtrlAlt." + +#: ../C/vinagre.xml:324(title) +msgid "To Close a Connection" +msgstr "Zamykanie połączenia" + +#: ../C/vinagre.xml:325(para) +msgid "To close a connection, choose MachineClose." +msgstr "W celu zamknięcia połączenia, należy wybrać z menu polecenie KomputerZamknij." + +#: ../C/vinagre.xml:334(title) +msgid "To Take Screenshot" +msgstr "Pobieranie zrzutu ekranu" + +#: ../C/vinagre.xml:335(para) +msgid "To take screenshot of the current remote desktop, choose MachineTake Screenshot or press the relative button in the toolbar. The Save Screenshot dialog is displayed, click the Save button to save the screenshot." +msgstr "W celu pobrania zrzutu ekranu aktualnego zdalnego pulpitu, należy wybrać z menu polecenie KomputerPobierz rzut ekranu lub nacisnąć odpowiedni przycisk na pasku narzędziowym. Na ekranie zostanie wyświetlone okno dialogowe Zapisz zrzut ekranu, gdzie należy nacisnąć przycisk Zapisz w celu zapisania zrzutu ekranu." + +#: ../C/vinagre.xml:349(title) +msgid "About" +msgstr "Informacje o programie" + +#: ../C/vinagre.xml:350(para) +msgid "Vinagre was written by Jonh Wendell wendell@bani.com.br. To find more information about Vinagre, please visit the Vinagre web page." +msgstr "Program Vinagre został napisany przez Jonha Wendella wendell@bani.com.br. Aby uzyskać więcej informacji o programie Vinagre, proszę odwiedzić stronę domową programu Vinagre." + +#: ../C/vinagre.xml:356(para) +msgid "To report a bug or make a suggestion regarding this application you can file a bug in our bug tracker." +msgstr "Aby zgłosić błąd lub sugestie dotyczącą tego programu, proszę utworzyć zgłoszenie w naszym systemie śledzenia błędów." + +#: ../C/vinagre.xml:362(para) +msgid "This program is distributed 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. A copy of this license can be found at the GNU site, or in the file COPYING included with the source code of this program." +msgstr "Niniejszy program jest rozpowszechniany na warunkach zawartych w Powszechnej Licencji Publicznej GNU, jak została ona opublikowana przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według wersji drugiej tej Licencji lub którejś z późniejszych wersji. Kopia tej licencji znajduje się na stronie GNU lub w pliku COPYING dostarczonym wraz z kodem źródłowym tego programu." + +#: ../C/legal.xml:2(para) +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "Udziela się zezwolenia do kopiowania rozpowszechniania i/lub modyfikację tego dokumentu zgodnie z zasadami Licencji GNU Wolnej Dokumentacji w wersji 1.1 lub dowolnej późniejszej opublikowanej przez Fundację Wolnego Oprogramowania (Free Software Foundation); wraz z zawartymi Sekcjami Niezmiennymi, wraz z Tekstem na Przedniej Okładce i z Tekstem na Tylnej Okładce. Kopia licencji dostępna jest pod adresem link oraz w pliku COPYING-DOCS dystrybuowanym z niniejszym podręcznikiem." + +#: ../C/legal.xml:12(para) +msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." +msgstr "Ten podręcznik jest częścią kolekcji podręczników użytkownika GNOME dystrybuowanych na zasadach GFDL. W celu rozpowszechniania tego podręcznika w odłączeniu od kolekcji, należy dodać kopię tej licencji, jak wyjaśniono to w sekcji 6. licencji." + +#: ../C/legal.xml:19(para) +msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters." +msgstr "Wiele z nazw używanych przez podmioty by oznaczyć ich produkty i usługi jest zarejestrowanymi znakami towarowymi. W miejscu gdzie takie nazwy pojawiają się w dokumentacji środowiska GNOME i członkowie Projektu Dokumentacji GNOME są świadomi ich istnienia, nazwy te zapisane są wielkimi literami lub rozpoczynają się z wielkiej litery." + +#: ../C/legal.xml:35(para) +msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" + +#: ../C/legal.xml:55(para) +msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." +msgstr "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." + +#: ../C/legal.xml:28(para) +msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +msgstr "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2. +#: ../C/legal.xml:0(None) +msgid "translator-credits" +msgstr "" +"Aviary.pl , 2009\n" +"Łukasz Jernaś , 2009" + diff -Nru vinagre-2.26.1/help/pl/vinagre.xml vinagre-2.29.1/help/pl/vinagre.xml --- vinagre-2.26.1/help/pl/vinagre.xml 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/help/pl/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -0,0 +1,530 @@ + + + + +&app;"> + + +]> + + +
+ + + + + Podręcznik użytkownika <application>Vinagre</application> + + Program Vinagre jest przeglądarką zdalnych pulpitów + + + 2007, 2008, 2009 + Jonh Wendell (wendell@bani.com.br) + 2009Aviary.pl (gnomepl@aviary.pl)2009Łukasz Jernaś (deejay1@srem.org) + + + + + + Jonh Wendell + + + + Udziela się zezwolenia do kopiowania rozpowszechniania i/lub modyfikację tego dokumentu zgodnie z zasadami Licencji GNU Wolnej Dokumentacji w wersji 1.1 lub dowolnej późniejszej opublikowanej przez Fundację Wolnego Oprogramowania (Free Software Foundation); wraz z zawartymi Sekcjami Niezmiennymi, wraz z Tekstem na Przedniej Okładce i z Tekstem na Tylnej Okładce. Kopia licencji dostępna jest pod adresem link oraz w pliku COPYING-DOCS dystrybuowanym z niniejszym podręcznikiem. + Ten podręcznik jest częścią kolekcji podręczników użytkownika GNOME dystrybuowanych na zasadach GFDL. W celu rozpowszechniania tego podręcznika w odłączeniu od kolekcji, należy dodać kopię tej licencji, jak wyjaśniono to w sekcji 6. licencji. + + Wiele z nazw używanych przez podmioty by oznaczyć ich produkty i usługi jest zarejestrowanymi znakami towarowymi. W miejscu gdzie takie nazwy pojawiają się w dokumentacji środowiska GNOME i członkowie Projektu Dokumentacji GNOME są świadomi ich istnienia, nazwy te zapisane są wielkimi literami lub rozpoczynają się z wielkiej litery. + + DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: + + DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND + + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. + + + + + + + + + + Vinicius + Depizzol + vdepizzol@gmail.com + + + + Jonh + Wendell + wendell@bani.com.br + + + + + + + + 0.3 + 2009-08-23 + + Jonh Wendell + wendell@bani.com.br + + + + + 0.2 + 2008-01-15 + + Vinicius Depizzol vdepizzol@gmail.com + + + + 0.1 + 2007-12-16 + + Jaap A. Haitsma jaap@haitsma.org + Jaap A. Haitsma + + + + + + Opinie + + To report a bug or make a suggestion regarding the Vinagre application or + this manual, please file a bug at + GNOME bugzilla page. + + + + + + + Vinagre + + + zdalny pulpit + + + + +
+ Wstęp + + + + + Vinagre + Podręcznik użytkownika + vinagre + + + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. + Program Vinagre pozwala na: + + + łączenie się z wieloma komputerami równocześnie, + + + zapamiętywanie ostatnich połączeń i zapisywanie zakładek do nich, + + + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. + + + +
+ + +
+ Pierwsze kroki + + + +
+ Uruchamianie programu Vinagre + Program Vinagre można uruchomić w jeden z następujących sposobów: + + + wybierając z menu Programy + + polecenie InternetPrzeglądarka zdalnych pulpitów, + + + + wpisując w oknie terminala + + polecenie vinagre. + + + +
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
+ Główne okno programu Vinagre +
+ Główne okno programu Vinagre + + + + + + Przedstawia główne okno programu Vinagre. + + + +
+ + Główne okno programu Vinagre zawiera następujące elementy: + + + + pasek menu + + Pasek menu zawiera wszystkie polecenia potrzebne do pracy ze zdalnymi połączeniami w programie Vinagre. + + + + pasek narzędziowy + + Pasek narzędziowy zawiera podzbiór poleceń, które można wywołać z paska menu. + + + + obszar wyświetlania + + Obszar wyświetlania zawiera listę kart połączonych komputerów i ich zdalnych pulpitów. + + + + pasek stanu + + Pasek stanu wyświetla informacje o obecnym stanie programu Vinagre, jak również informacje o poleceniach menu. + + + + panel boczny + + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines. + + + +
+ + +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+ +
+ +
+ Korzystanie z programu Vinagre + +
+ To connect to a remote machine + +
+ Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + + + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ + Jeśli połączenie było wcześniej używane, można uzyskać do niego dostęp poprzez skorzystanie z menu KomputerOstatnie połączenia. +
+ +
+ Otwieranie pliku zdalnego połączenia + Niektóre komputery dostarczają pliki zdalnego pulpitu (często zakończone końcówką ".vnc") i nie wymagają podawania adresu i portu komputera. W celu otwarcia takiego pliku, należy wybrać z menu polecenie CtrlOKomputerOtwórz, po czym zostanie wyświetlone okno dialogowe Wybór pliku. Należy wybrać plik, który ma zostać otwarty, a następnie nacisnąć przycisk Otwórz. + + + Można również kliknąć dwukrotnie plik zdalnego pulpitu w menedżerze plików Nautilus, aby wyświetlić go w oknie programu Vinagre + +
+ +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+ +
+ +
+ Tryb pełnego ekranu + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + + +
+ +
+ Zamykanie połączenia + W celu zamknięcia połączenia, należy wybrać z menu polecenie KomputerZamknij. +
+ +
+ Pobieranie zrzutu ekranu + W celu pobrania zrzutu ekranu aktualnego zdalnego pulpitu, należy wybrać z menu polecenie KomputerPobierz rzut ekranu lub nacisnąć odpowiedni przycisk na pasku narzędziowym. Na ekranie zostanie wyświetlone okno dialogowe Zapisz zrzut ekranu, gdzie należy nacisnąć przycisk Zapisz w celu zapisania zrzutu ekranu. +
+ +
+ + +
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ Tworzenie nowej zakładki + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ Modyfikacja zakładki + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ Usuwanie zakładki + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+ +
+ Informacje o programie + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + + Aby zgłosić błąd lub sugestie dotyczącą tego programu, proszę utworzyć zgłoszenie w naszym systemie śledzenia błędów. + Niniejszy program jest rozpowszechniany na warunkach zawartych w Powszechnej Licencji Publicznej GNU, jak została ona opublikowana przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według wersji drugiej tej Licencji lub którejś z późniejszych wersji. Kopia tej licencji znajduje się na stronie GNU lub w pliku COPYING dostarczonym wraz z kodem źródłowym tego programu. +
+ +
diff -Nru vinagre-2.26.1/help/pt/vinagre.xml vinagre-2.29.1/help/pt/vinagre.xml --- vinagre-2.26.1/help/pt/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/pt/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +151,7 @@ vinagre - A aplicação Vinagre é o Visualizador de Ambiente de Trabalho Remoto do Ambiente de Trabalho GNOME que utiliza o sistema Virtual Network Computing (VNC) para controlar remotamente outro computador. + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. Vinagre disponibiliza as seguintes funcionalidades: @@ -142,7 +161,13 @@ Guardar ligações recentes permitindo criar marcadores. - Procurar Servidores VNC na rede local. + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -154,7 +179,7 @@ -
+
Iniciar o Vinagre Pode iniciar o Vinagre das seguintes formas: @@ -172,8 +197,19 @@
- -
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
A Janela do Vinagre
Janela do Vinagre @@ -218,26 +254,92 @@ Painel Lateral - O painel lateral contém uma lista dos marcadores de ligações. + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+
Utilizar o Vinagre
- Para se ligar a uma máquina remota + To connect to a remote machine
- A informar endereço da máquina - Para se ligar a uma máquina remota, seleccione CtrlNMáquinaLigar. O Diálogo de Ligação é apresentado. Insira a Máquina e o Porto da ligação e clique no botão Ligar. Também pode utilizar o botão Procurar para procurar as máquinas disponiveis na rede local. + Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + - Algumas máquinas podem requerer uma ligação segura. Nesse caso, um diálogo Senha será apresentado a pedir a senha da ligação. Se marcar Recordar esta senha, o Vinagre irá guardar a informação de segurança utilizando o Gestor de Chaveiros do GNOME. + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ Se a ligação foi utilizada previamente, poderá também aceder-lhe por MáquinaLigações recentes....
@@ -249,26 +351,32 @@ Pode também fazer um duplo clique num ficheiro de ligação remota no gestor de ficheiros Nautilus para o abrir na janela do Vinagre.
-
- -
- Para Criar um Novo Marcador - Para marcar a ligação actualmente visível, seleccione CtrlDMarcadoresAdicionar aos Marcadores. O diálogo Guardar nos Marcadores é apresentado. Introduza o nome da ligação e clique em Ok. -
- -
- Para Remover um Marcador - Para remover um marcador, seleccione Remover no menu de contexto do marcador no Painel Lateral. -
- -
- Para Editar as Propriedades de um Marcador - Para editar as propriedades de um marcador, tais como o seu nome e máquina, seleccione Editar no menu de contexto do marcador no Painel Lateral. + +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
- Para Utilizar o Modo de Ecrã Completo - Para ampliar a Área de Apresentação para modo de ecrã completo, seleccione F11VerEcrã Completo. Para sair do modo de ecrã completo, pressione F11 ou CtrlAlt. + Para Utilizar o Modo de Ecrã Completo + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -284,9 +392,137 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ Para Criar um Novo Marcador + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ Para Editar as Propriedades de um Marcador + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ Para Remover um Marcador + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
Sobre - Vinagre foi escrito por John Wendell wendell@bani.com.br. Para encontrar mais informações sobre o Vinagre, visite a Página Web do Vinagre. + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + Para relatar um erro ou fazer uma sugestão em relação a esta aplicação pode comunicar um erro no nosso sistema de acompanhamento de erros. Esta aplicação é distribuída sob os termos da Licença Pública Genérica GNU tal como publicada pela Free Software Foundation; tanto a versão 2 da Licença, ou (como preferir) qualquer versão posterior. Uma cópia desta licença pode ser encontrada na página web da GNU, ou no ficheiro COPYING incluído com o código-fonte desta aplicação.
Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/pt_BR/figures/vinagre-auth-needed.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/pt_BR/figures/vinagre-auth-needed.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/pt_BR/figures/vinagre-bookmarks-side-panel.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/pt_BR/figures/vinagre-bookmarks-side-panel.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/pt_BR/figures/vinagre-connect-dialog.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/pt_BR/figures/vinagre-connect-dialog.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/pt_BR/figures/vinagre-editing-bookmarks.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/pt_BR/figures/vinagre-editing-bookmarks.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/pt_BR/figures/vinagre-saving-bookmarks.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/pt_BR/figures/vinagre-saving-bookmarks.png differ Binary files /tmp/gRPS7GrxeZ/vinagre-2.26.1/help/pt_BR/figures/vinagre-screenshot.png and /tmp/yAOj1uSFf7/vinagre-2.29.1/help/pt_BR/figures/vinagre-screenshot.png differ diff -Nru vinagre-2.26.1/help/pt_BR/pt_BR.po vinagre-2.29.1/help/pt_BR/pt_BR.po --- vinagre-2.26.1/help/pt_BR/pt_BR.po 2009-04-13 14:36:21.000000000 +0100 +++ vinagre-2.29.1/help/pt_BR/pt_BR.po 2009-10-26 13:44:11.000000000 +0000 @@ -3,14 +3,17 @@ # This file is distributed under the same license as the Vinagre package. # Leonardo Gregianin , 2008. # Leonardo Ferreira Fontenelle , 2008. +# Krix Apolinário , 2009. +# Rodrigo L. M. Flores , 2009. # + msgid "" msgstr "" "Project-Id-Version: vinagre\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-28 16:54+0000\n" -"PO-Revision-Date: 2008-12-10 19:26-0300\n" -"Last-Translator: Leonardo Gregianin \n" +"POT-Creation-Date: 2009-08-25 00:54+0000\n" +"PO-Revision-Date: 2009-08-29 10:18-0300\n" +"Last-Translator: Rodrigo L. M. Flores \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,13 +22,39 @@ #. 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/vinagre.xml:180(None) -msgid "" -"@@image: 'figures/vinagre-screenshot.png'; " -"md5=b085b9b302f38aa59e8b4e3307dd6450" -msgstr "" -"@@image: 'figures/vinagre-screenshot.png'; " -"md5=b085b9b302f38aa59e8b4e3307dd6450" +#: C/vinagre.xml:212(None) +msgid "@@image: 'figures/vinagre-screenshot.png'; md5=dc88b591b3b8ed3a49335c5431806c13" +msgstr "@@image: 'figures/vinagre-screenshot.png'; md5=dc88b591b3b8ed3a49335c5431806c13" + +#. 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/vinagre.xml:298(None) +msgid "@@image: 'figures/vinagre-connect-dialog.png'; md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" +msgstr "@@image: 'figures/vinagre-connect-dialog.png'; md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" + +#. 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/vinagre.xml:330(None) +msgid "@@image: 'figures/vinagre-auth-needed.png'; md5=3cd74cebc8d1d5e2c23b4419e28f6c11" +msgstr "@@image: 'figures/vinagre-auth-needed.png'; md5=3cd74cebc8d1d5e2c23b4419e28f6c11" + +#. 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/vinagre.xml:432(None) +msgid "@@image: 'figures/vinagre-bookmarks-side-panel.png'; md5=c657cdff0da28c73ac936227e490bb2e" +msgstr "@@image: 'figures/vinagre-bookmarks-side-panel.png'; md5=c657cdff0da28c73ac936227e490bb2e" + +#. 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/vinagre.xml:462(None) +msgid "@@image: 'figures/vinagre-saving-bookmarks.png'; md5=b99dbef848c5c0d487caecc320ed95de" +msgstr "@@image: 'figures/vinagre-saving-bookmarks.png'; md5=b99dbef848c5c0d487caecc320ed95de" + +#. 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/vinagre.xml:495(None) +msgid "@@image: 'figures/vinagre-editing-bookmarks.png'; md5=ac5097a12572cfce0561f0ca19bb1edb" +msgstr "@@image: 'figures/vinagre-editing-bookmarks.png'; md5=ac5097a12572cfce0561f0ca19bb1edb" #: C/vinagre.xml:25(title) msgid "Vinagre Manual" @@ -33,13 +62,11 @@ #: C/vinagre.xml:27(para) msgid "Vinagre is a Remote Desktop Viewer" -msgstr "" -"Vinagre é um Visualizador de Área de Trabalho " -"Remota" +msgstr "Vinagre é um visualizador de área de trabalho remota" #: C/vinagre.xml:32(year) -msgid "2007, 2008" -msgstr "2007, 2008" +msgid "2007, 2008, 2009" +msgstr "2007, 2008, 2009" #: C/vinagre.xml:33(holder) msgid "Jonh Wendell (wendell@bani.com.br)" @@ -50,110 +77,28 @@ msgstr "Jonh Wendell" #: C/vinagre.xml:2(para) -msgid "" -"Permission is granted to copy, distribute and/or modify this document under " -"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " -"later version published by the Free Software Foundation with no Invariant " -"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " -"in the file COPYING-DOCS distributed with this manual." -msgstr "" -"É dada a permissão para copiar, redistribuir e/ou modificar este documento " -"sob os termos da Licença de Documentação Livre GNU (GFDL) Versão 1.1 ou " -"qualquer versão superior publicada pela Free Software Foundation sem " -"quaisquer Seções Invariantes, Textos de Capa ou Prefácios, e sem Textos " -"Finais ou Posfácios. Você pode encontrar uma cópia da GFDL nestelink ou no arquivo COPYING-DOCS " -"distribuído com este manual." +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "É dada a permissão para copiar, redistribuir e/ou modificar este documento sob os termos da Licença de Documentação Livre GNU (GFDL) Versão 1.1 ou qualquer versão superior publicada pela Free Software Foundation sem quaisquer Seções Invariantes, Textos de Capa da frente e de trás. Você pode encontrar uma cópia da GFDL nestelink ou no arquivo COPYING-DOCS distribuído com este manual." #: C/vinagre.xml:12(para) -msgid "" -"This manual is part of a collection of GNOME manuals distributed under the " -"GFDL. If you want to distribute this manual separately from the collection, " -"you can do so by adding a copy of the license to the manual, as described in " -"section 6 of the license." -msgstr "" -"Este manual é parte da coleção de manuais do GNOME distribuído sob os termos " -"da licença GFDL. Se você quer distribuir este manual separadamente da " -"coleção, você pode fazer desde que inclua uma cópia da licença do manual, " -"como descrito na seção 6 da licença." +msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." +msgstr "Este manual é parte da coleção de manuais do GNOME distribuído sob os termos da licença GFDL. Se você quer distribuir este manual separadamente da coleção, você pode fazer desde que inclua uma cópia da licença do manual, como descrito na seção 6 da licença." #: C/vinagre.xml:19(para) -msgid "" -"Many of the names used by companies to distinguish their products and " -"services are claimed as trademarks. Where those names appear in any GNOME " -"documentation, and the members of the GNOME Documentation Project are made " -"aware of those trademarks, then the names are in capital letters or initial " -"capital letters." -msgstr "" -"Muitos dos nomes usados por companhias para distinguir seus produtos e " -"serviços são mencionados como marcas comerciais. Onde estes nomes apareciam " -"em qualquer documentação do GNOME, e os membros do Projeto de Documentação " -"GNOME estão atentos a estas marcas registradas, então os nomes estão em " -"letras maiúsculas ou com as iniciais em maiúsculas." +msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters." +msgstr "Muitos dos nomes usados por companhias para distinguir seus produtos e serviços são mencionados como marcas comerciais. Onde estes nomes apareciam em qualquer documentação do GNOME, e os membros do Projeto de Documentação GNOME estão atentos a estas marcas registradas, então os nomes estão em letras maiúsculas ou com as iniciais em maiúsculas." #: C/vinagre.xml:35(para) -msgid "" -"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " -"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " -"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS " -"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE " -"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " -"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " -"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " -"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " -"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " -"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " -"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" -msgstr "" -"ESTE DOCUMENTO É DISPONIBILIZADO NUMA BASE \"TAL COMO ESTÁ\", SEM QUALQUER " -"GARANTIA DE QUALQUER TIPO, NEM EXPRESSA NEM IMPLÍCITA, INCLUINDO, MAS SEM " -"LIMITAR, GARANTIAS DE QUE O DOCUMENTO OU VERSÃO ALTERADA DO DOCUMENTO SE " -"ENCONTRA LIVRE DE DEFEITOS PARA COMERCIALIZAÇÃO, ADEQUADO A UM PROPÓSITO " -"ESPECÍFICO OU QUE NÃO INFRINJA. A TOTALIDADE DO RISCO DE QUALIDADE, " -"PORMENORIZAÇÃO, E DESEMPENHO DO DOCUMENTO OU VERSÃO ALTERADA DO DOCUMENTO É " -"SUA. CASO ALGUM DOCUMENTO OU VERSÃO ALTERADA SE DEMONSTRE DEFICIENTE EM " -"QUALQUER ASPECTO, O LEITOR (E NÃO O AUTOR INICIAR, OU QUALQUER CONTRIBUINTE " -"POSTERIOR) ASSUME O CUSTO DE TODO O SERVIÇO DE REPARAÇÃO, ASSISTÊNCIA OU " -"CORRECÇÃO QUE POSSE SER NECESSÁRIO. ESTA DESRESPONSABILIZAÇÃO DE GARANTIA " -"CONSTITUI UMA PARTE ESSENCIAL DESTA LICENÇA. NENHUMA UTILIZAÇÃO DE QUALQUER " -"DOCUMENTO OU VERSÃO ALTERADO DO DOCUMENTO SE ENCONTRA AUTORIZADA EXCETO SE " -"\"SUJEITA A ESTA DESRESPONSABILIZAÇÃO; E" +msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "ESTE DOCUMENTO É DISPONIBILIZADO NUMA BASE \"TAL COMO ESTÁ\", SEM QUALQUER GARANTIA DE QUALQUER TIPO, NEM EXPRESSA NEM IMPLÍCITA, INCLUINDO, MAS SEM LIMITAR, GARANTIAS DE QUE O DOCUMENTO OU VERSÃO ALTERADA DO DOCUMENTO SE ENCONTRA LIVRE DE DEFEITOS PARA COMERCIALIZAÇÃO, ADEQUADO A UM PROPÓSITO ESPECÍFICO OU QUE NÃO INFRINJA. A TOTALIDADE DO RISCO DE QUALIDADE, PORMENORIZAÇÃO, E DESEMPENHO DO DOCUMENTO OU VERSÃO ALTERADA DO DOCUMENTO É SUA. CASO ALGUM DOCUMENTO OU VERSÃO ALTERADA SE DEMONSTRE DEFICIENTE EM QUALQUER ASPECTO, O LEITOR (E NÃO O AUTOR INICIAR, OU QUALQUER CONTRIBUINTE POSTERIOR) ASSUME O CUSTO DE TODO O SERVIÇO DE REPARAÇÃO, ASSISTÊNCIA OU CORRECÇÃO QUE POSSE SER NECESSÁRIO. ESTA DESRESPONSABILIZAÇÃO DE GARANTIA CONSTITUI UMA PARTE ESSENCIAL DESTA LICENÇA. NENHUMA UTILIZAÇÃO DE QUALQUER DOCUMENTO OU VERSÃO ALTERADO DO DOCUMENTO SE ENCONTRA AUTORIZADA EXCETO SE \"SUJEITA A ESTA DESRESPONSABILIZAÇÃO; E" #: C/vinagre.xml:55(para) -msgid "" -"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " -"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " -"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE " -"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON " -"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF " -"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, " -"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES " -"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " -"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " -"POSSIBILITY OF SUCH DAMAGES." -msgstr "" -"SOB QUAISQUER CIRCUNSTÂNCIAS E TEORIA LEGAL, QUER SEJA POR ERRO (INCLUINDO " -"NEGLIGÊNCIA), CONTRATO, OU QUALQUER OUTRO MOTIVO, PODERÁ O AUTOR, ESCRITOR " -"INICIAL, QUALQUER CONTRIBUINTE, OU QUALQUER DISTRIBUIDOR DO DOCUMENTO OU " -"VERSÃO ALTERADA DO DOCUMENTO, OU QUALQUER FORNECEDOR DE UMA DESSAS PARTES, " -"SER RESPONSÁVEL PERANTE QUALQUER PESSOA POR QUAISQUER DANOS DIRETOS, " -"\"INDIRETOS, ESPECIAIS, ACIDENTAIS OU CONSEQUENCIAIS DE QUALQUER TIPO " -"INCLUINDO, SEM LIMITAR, DANOS POR PERCA DE BOM NOME (GOODWILL), PARAGENS DE " -"TRABALHO, FALHA OU MAU FUNCIONAMENTO INFORMÁTICO, OU QUALQUER E TODOS OS " -"OUTROS DANOS OU PERCAS DECORRENTES OU RELACIONADAS COM A UTILIZAÇÃO DO " -"DOCUMENTO E VERSÕES ALTERADAS DO DOCUMENTO, MESMO QUE TAL PARTE TENHA SIDO " -"INFORMADA DA POSSIBILIDADE DE OCORREREM TAIS DANOS." +msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." +msgstr "SOB QUAISQUER CIRCUNSTÂNCIAS E TEORIA LEGAL, QUER SEJA POR ERRO (INCLUINDO NEGLIGÊNCIA), CONTRATO, OU QUALQUER OUTRO MOTIVO, PODERÁ O AUTOR, ESCRITOR INICIAL, QUALQUER CONTRIBUINTE, OU QUALQUER DISTRIBUIDOR DO DOCUMENTO OU VERSÃO ALTERADA DO DOCUMENTO, OU QUALQUER FORNECEDOR DE UMA DESSAS PARTES, SER RESPONSÁVEL PERANTE QUALQUER PESSOA POR QUAISQUER DANOS DIRETOS, \"INDIRETOS, ESPECIAIS, ACIDENTAIS OU CONSEQUENCIAIS DE QUALQUER TIPO INCLUINDO, SEM LIMITAR, DANOS POR PERCA DE BOM NOME (GOODWILL), PARAGENS DE TRABALHO, FALHA OU MAU FUNCIONAMENTO INFORMÁTICO, OU QUALQUER E TODOS OS OUTROS DANOS OU PERCAS DECORRENTES OU RELACIONADAS COM A UTILIZAÇÃO DO DOCUMENTO E VERSÕES ALTERADAS DO DOCUMENTO, MESMO QUE TAL PARTE TENHA SIDO INFORMADA DA POSSIBILIDADE DE OCORREREM TAIS DANOS." #: C/vinagre.xml:28(para) -msgid "" -"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS " -"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " -"" -msgstr "" -"ESTE DOCUMENTO E AS VERSÕES MODIFICADAS DO MESMO SÃO PROPORCIONADAS SEGUNDO " -"AS CONDIÇÕES ESTABELECIDAS NA LICENÇA DE DOCUMENTAÇÃO LIVRE GNU (GFDL) E " -"TENDO EM CONTA QUE: " +msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +msgstr "ESTE DOCUMENTO E AS VERSÕES MODIFICADAS DO MESMO SÃO PROPORCIONADAS SEGUNDO AS CONDIÇÕES ESTABELECIDAS NA LICENÇA DE DOCUMENTAÇÃO LIVRE GNU (GFDL) E TENDO EM CONTA QUE: " #: C/vinagre.xml:59(firstname) msgid "Vinicius" @@ -167,440 +112,465 @@ msgid "vdepizzol@gmail.com" msgstr "vdepizzol@gmail.com" -#: C/vinagre.xml:80(revnumber) +#: C/vinagre.xml:65(firstname) +msgid "Jonh" +msgstr "Jonh" + +#: C/vinagre.xml:66(surname) +msgid "Wendell" +msgstr "Wendell" + +#: C/vinagre.xml:67(email) +msgid "wendell@bani.com.br" +msgstr "wendell@bani.com.br" + +#: C/vinagre.xml:86(revnumber) +msgid "0.3" +msgstr "0.3" + +#: C/vinagre.xml:87(date) +msgid "2009-08-23" +msgstr "2009-08-23" + +#: C/vinagre.xml:89(para) +msgid "Jonh Wendell wendell@bani.com.br" +msgstr "Jonh Wendell wendell@bani.com.br" + +#: C/vinagre.xml:95(revnumber) msgid "0.2" msgstr "0.2" -#: C/vinagre.xml:81(date) +#: C/vinagre.xml:96(date) msgid "2008-01-15" msgstr "2008-01-15" -#: C/vinagre.xml:83(para) +#: C/vinagre.xml:98(para) msgid "Vinicius Depizzol vdepizzol@gmail.com" msgstr "Vinicius Depizzol vdepizzol@gmail.com" -#: C/vinagre.xml:89(revnumber) +#: C/vinagre.xml:104(revnumber) msgid "0.1" msgstr "0.1" -#: C/vinagre.xml:90(date) +#: C/vinagre.xml:105(date) msgid "2007-12-16" msgstr "2007-12-16" -#: C/vinagre.xml:92(para) +#: C/vinagre.xml:107(para) msgid "Jaap A. Haitsma jaap@haitsma.org" msgstr "Jaap A. Haitsma jaap@haitsma.org" -#: C/vinagre.xml:95(para) +#: C/vinagre.xml:110(para) msgid "Jaap A. Haitsma" msgstr "Jaap A. Haitsma" -#: C/vinagre.xml:101(title) +#: C/vinagre.xml:116(title) msgid "Feedback" msgstr "Feedback" -#: C/vinagre.xml:102(para) -msgid "" -"To report a bug or make a suggestion regarding the Vinagre application or " -"this manual, follow the directions in the Vinagre Contact " -"Page." -msgstr "" -"Para relatar um erro ou fazer uma sugestão em relação ao aplicativo Vinagre " -"ou este manual, siga os passos na Página de Contato do Vinagre." +#: C/vinagre.xml:117(para) +msgid "To report a bug or make a suggestion regarding the Vinagre application or this manual, please file a bug at GNOME bugzilla page." +msgstr "Para relatar um erro ou fazer uma sugestão em relação a esta aplicação, você pode abrir um relatório de erro na nossa Página do Bugzilla do GNOME." #: C/vinagre.xml:0(application) msgid "Vinagre" msgstr "Vinagre" -#: C/vinagre.xml:116(primary) +#: C/vinagre.xml:131(primary) msgid "remote desktop" msgstr "área de trabalho remota" -#: C/vinagre.xml:122(title) +#: C/vinagre.xml:137(title) msgid "Introduction" msgstr "Introdução" -#: C/vinagre.xml:128(secondary) +#: C/vinagre.xml:143(secondary) msgid "Manual" msgstr "Manual" -#: C/vinagre.xml:129(tertiary) +#: C/vinagre.xml:144(tertiary) msgid "vinagre" msgstr "vinagre" -#: C/vinagre.xml:132(para) -msgid "" -"The Vinagre application is a Remote Desktop Viewer for the GNOME " -"desktop that uses Virtual Network Computing (VNC) system to " -"remotely control another computer." -msgstr "" -"O aplicativo Vinagre é um Visualizador de Área de Trabalho Remota para o " -"Ambiente GNOME. Ele usa o sistema VNC (Virtual " -"Network Computing) para controlar remotamente outro computador." +#: C/vinagre.xml:147(para) +msgid "The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer." +msgstr "O aplicativo Vinagre é um Visualizador de Área de Trabalho Remota para o Ambiente GNOME. Ele usa o sistema VNC (Virtual Network Computing) (e possivelmente outros protocolos) para controlar remotamente outro computador." -#: C/vinagre.xml:133(para) +#: C/vinagre.xml:148(para) msgid "Vinagre provides the following features:" -msgstr "" -"O Vinagre disponibiliza os seguintes recursos:" +msgstr "O Vinagre disponibiliza os seguintes recursos:" -#: C/vinagre.xml:136(para) +#: C/vinagre.xml:151(para) msgid "Connect to several machines at the same time." -msgstr "Conectar-se simultaneamente a várias máquinas." +msgstr "Conecta-se simultaneamente a várias máquinas." -#: C/vinagre.xml:139(para) +#: C/vinagre.xml:154(para) msgid "Store recently connections and allows to bookmark them." -msgstr "Salvar conexões recentes e criar marcadores de conexões." +msgstr "Salva conexões recentes e permite criar marcadores destas." # Esse recurso é baseado no Avahi. -#: C/vinagre.xml:142(para) -msgid "Browse local network for VNC Servers." -msgstr "Descobrir servidores de VNC na rede local." +#: C/vinagre.xml:157(para) +msgid "Browse local network for machines." +msgstr "Descobre máquinas na rede local." + +#: C/vinagre.xml:160(para) +msgid "Provide a GNOME Panel applet to quickly access your bookmarked machines." +msgstr "Provê um mini-aplicativo no painel do GNOME para acessar rapidamente as suas máquinas marcadas." + +#: C/vinagre.xml:163(para) +msgid "Extensible through its plugin structure." +msgstr "Extensível através de sua estrutura de plug-ins." -#: C/vinagre.xml:150(title) +#: C/vinagre.xml:171(title) msgid "Getting Started" msgstr "Iniciando" -#: C/vinagre.xml:155(title) +#: C/vinagre.xml:176(title) msgid "Starting Vinagre" msgstr "Iniciando o Vinagre" -#: C/vinagre.xml:156(para) +#: C/vinagre.xml:177(para) msgid "You can start Vinagre in the following ways:" -msgstr "" -"Você pode iniciar o Vinagre das seguintes formas:" +msgstr "Você pode iniciar o Vinagre das seguintes formas:" -#: C/vinagre.xml:159(term) +#: C/vinagre.xml:180(term) msgid "Applications menu" msgstr "Menu Aplicativos" -#: C/vinagre.xml:161(para) -msgid "" -"Choose InternetRemote " -"Desktop Viewer." -msgstr "" -"Selecione InternetVisualizador de Área de Trabalho Remota." +#: C/vinagre.xml:182(para) +msgid "Choose InternetRemote Desktop Viewer." +msgstr "Selecione InternetVisualizador de Área de Trabalho Remota." -#: C/vinagre.xml:165(term) +#: C/vinagre.xml:186(term) msgid "Command line" msgstr "Linha de comando" -#: C/vinagre.xml:167(para) +#: C/vinagre.xml:188(para) msgid "Execute the following command: vinagre" msgstr "Execute o seguinte comando: vinagre" -#: C/vinagre.xml:174(title) +#: C/vinagre.xml:196(title) +msgid "Starting Vinagre from a command line" +msgstr "Iniciando o Vinagre da linha de comando" + +#: C/vinagre.xml:197(para) +msgid "You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return:" +msgstr "Você pode executar o Vinagre a partir da linha de comando e conectar a uma única máquina ou múltiplas máquinas. Para se conectar a uma máquina a partir da linha de comando, digite o seguinte comando, então pressione Enter:" + +#: C/vinagre.xml:198(replaceable) +msgid "hostname_or_ip_address" +msgstr "nomedamaquina_ou_endereco_ip" + +#: C/vinagre.xml:198(command) +msgid "vinagre " +msgstr "vinagre " + +#: C/vinagre.xml:199(para) +msgid "For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1." +msgstr "Para obter mais informações sobre como executar o Vinagre a partir da linha de comando, veja a página do manual unix para o Vinagre, Vinagre1." + +#: C/vinagre.xml:206(title) msgid "The Vinagre Window" -msgstr "A Janela do Vinagre" +msgstr "A janela do Vinagre" -#: C/vinagre.xml:176(title) +#: C/vinagre.xml:208(title) msgid "Vinagre window" msgstr "Janela do Vinagre" -#: C/vinagre.xml:182(phrase) +#: C/vinagre.xml:214(phrase) msgid "Shows vinagre main window." msgstr "Apresenta a janela principal do vinagre." -#: C/vinagre.xml:188(para) -msgid "" -"The Vinagre window contains the following " -"elements:" -msgstr "" -"A janela do Vinagre contém os seguintes elementos:" +#: C/vinagre.xml:220(para) +msgid "The Vinagre window contains the following elements:" +msgstr "A janela do Vinagre contém os seguintes elementos:" -#: C/vinagre.xml:193(term) +#: C/vinagre.xml:225(term) msgid "Menubar" msgstr "Barra de menus" -#: C/vinagre.xml:195(para) -msgid "" -"The menus on the menubar contain all of the commands you need to work with " -"remote connections in Vinagre." -msgstr "" -"Os menus na barra de menu contém todos os comandos de que você necessita " -"para trabalhar com conexões remotas no Vinagre." +#: C/vinagre.xml:227(para) +msgid "The menus on the menubar contain all of the commands you need to work with remote connections in Vinagre." +msgstr "Os menus na barra de menus contém todos os comandos de que você necessita para trabalhar com conexões remotas no Vinagre." -#: C/vinagre.xml:199(term) +#: C/vinagre.xml:231(term) msgid "Toolbar" msgstr "Barra de ferramentas" -#: C/vinagre.xml:201(para) -msgid "" -"The toolbar contains a subset of the most used commands that you can access " -"from the menubar." -msgstr "" -"A barra de ferramentas contém um subconjunto dos comandos mais utilizados " -"dentre os que você pode acessar pela barra de menu." +#: C/vinagre.xml:233(para) +msgid "The toolbar contains a subset of the most used commands that you can access from the menubar." +msgstr "A barra de ferramentas contém um subconjunto dos comandos mais utilizados dentre os que você pode acessar pela barra de menu." -#: C/vinagre.xml:205(term) +#: C/vinagre.xml:237(term) msgid "Display Area" msgstr "Área de exibição" -#: C/vinagre.xml:207(para) -msgid "" -"The display area contains a list of tabs with the connected machines and its " -"remote desktops." -msgstr "" -"A área de exibição contém uma lista de abas com as máquinas conectadas e " -"suas áreas de trabalho remotas." +#: C/vinagre.xml:239(para) +msgid "The display area contains a list of tabs with the connected machines and its remote desktops." +msgstr "A área de exibição contém uma lista de abas com as máquinas conectadas e suas áreas de trabalho remotas." -#: C/vinagre.xml:211(term) +#: C/vinagre.xml:243(term) msgid "Statusbar" msgstr "Barra de status" -#: C/vinagre.xml:213(para) -msgid "" -"The statusbar displays information about current Vinagre activity and contextual information about the menu items." -msgstr "" -"A barra de status exibe informações sobre a atividade atual do " -"Vinagre e informações contextuais sobre os itens " -"do menu." +#: C/vinagre.xml:245(para) +msgid "The statusbar displays information about current Vinagre activity and contextual information about the menu items." +msgstr "A barra de status exibe informações sobre a atividade atual do Vinagre e informações contextuais sobre os itens do menu." -#: C/vinagre.xml:217(term) +#: C/vinagre.xml:249(term) msgid "Side Pane" msgstr "Painel lateral" -#: C/vinagre.xml:219(para) -msgid "The side pane contains a list of bookmarked connections." -msgstr "O painel lateral contém uma lista dos marcadores de conexões." - -#: C/vinagre.xml:228(title) -msgid "Using Vinagre" -msgstr "Usando o Vinagre" - -#: C/vinagre.xml:231(title) -msgid "To connect with a remote machine" -msgstr "Conectando-se a uma máquina remota" - -#: C/vinagre.xml:234(title) -msgid "Informing Host address" -msgstr "Informando o endereço da máquina" +#: C/vinagre.xml:251(para) +msgid "The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines." +msgstr "O painel lateral contém uma lista de marcadores de conexões e (se disponível) uma lista de máquinas da rede descobertas automaticamente." -#: C/vinagre.xml:235(para) -msgid "" -"To connect with a remote machine, choose " -"CtrlNMachineConnect. The Connection Dialog is " -"displayed. Inform the Host and the Port of the connection and click the Connect " -"button. You can also use the Find button to browse " -"available machines on local network." -msgstr "" -"Para conectar-se a uma máquina remota, selecione " -"CtrlNMáquinaConectar. O Diálogo de Conexão será " -"exibido. Informe a Máquina e a Porta da conexão e clique no botão Conectar. Você " -"também pode utilizar o botão Localizar para procurar " -"as máquinas disponíveis na rede local." +#: C/vinagre.xml:259(title) +msgid "Some notes about Vinagre" +msgstr "Algumas notas sobre o Vinagre" -#: C/vinagre.xml:246(para) -msgid "" -"Some machines may require a secure connection. In this case, a " -"Password dialog will be displayed asking for the " -"connection password. If you check Remember this password, Vinagre will store the secure " -"information using GNOME Keyring Manager." +#: C/vinagre.xml:260(para) +msgid "As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation." msgstr "" -"Algumas máquinas podem requerer uma conexão segura. Nesse caso, um diálogo " -"Senha será exibido e pedirá a senha da conexão. Se você " -"marcar Lembrar esta senha, o Vinagre irá salvar a informação de segurança utilizando o " -"Gerenciador de Arquivos do GNOME." +"Como uma ferramenta que acessa outras máquinas, Vinagre se comporta diferentemente de outras aplicações do GNOME na sua instalação padrão." -#: C/vinagre.xml:253(para) -msgid "" -"If the connection has been used previously, you can also access it by " -"MachineRecent connections...." -msgstr "" -"Se a conexão foi utilizada previamente, você poderá também acessá-la por " -"MáquinaConexões recentes...." +#: C/vinagre.xml:261(para) +msgid "Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine." +msgstr "Vinagre vem com os aceleradores de menu e atalhos de teclado desabilitados por padrão. Isto evita que as teclas sejam interceptadas pelo Vinagre quando você quiser enviar essas teclas para a máquina remota." -#: C/vinagre.xml:263(title) -msgid "Opening a Remote Connection File" -msgstr "Abrindo um arquivo de conexão remota" +#: C/vinagre.xml:262(para) +msgid "For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default." +msgstr "Por exemplo, o atalho de teclado para fechar uma aba é Ctrl+W, mas esta combinação será enviada para a máquina remota por padrão." -#: C/vinagre.xml:264(para) -msgid "" -"Some hosts distribute remote connection files (generally ending with suffix " -"\".vnc\") instead of inform Host address and Port. To open a remote " -"connection file, choose CtrlOMachineOpen. The Select " -"File dialog is displayed. Select the file you want to open, then " -"click on the Open button." -msgstr "" -"Algumas máquinas distribuem o arquivo de conexão remota (geralmente " -"terminados com o sufixo \".vnc\") em vez de fornecerem o endereço da Máquina " -"e da Porta. Para abrir um arquivo de conexão remota, selecione " -"CtrlOMáquinaAbrir. O diálogo Escolha o arquivo " -"será exibido. Selecione o arquivo que quer abrir, e clique no botão " -"Abrir." +#: C/vinagre.xml:263(para) +msgid "If you want to change this behavior, go to Vinagre preferences in EditPreferences." +msgstr "Se você quer alterar este comportamento, vá para as preferências do Vinagre em EditarPreferências." -#: C/vinagre.xml:276(para) -msgid "" -"You can also double-click on a remote connection file in the " -"Nautilus file manager to open it on the " -"Vinagre window." -msgstr "" -"Você pode também dar um clique duplo em um arquivo de conexão remota no " -"gerenciador de arquivos Nautilus para abrir na " -"janela do Vinagre." - -#: C/vinagre.xml:284(title) -msgid "To Create a New Bookmark" -msgstr "Criando um novo marcador" - -#: C/vinagre.xml:285(para) -msgid "" -"To bookmark the currently viewed connection, choose " -"CtrlDBookmarksAdd to " -"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and click " -"Ok." -msgstr "" -"Para marcar a conexão atualmente visível, selecione " -"CtrlDMarcadoresAdicionar aos " -"marcadores. O diálogo Salvando nos " -"marcadores será exibido. Introduza o nome da conexão e clique em " -"OK." - -#: C/vinagre.xml:296(title) -msgid "To Remove a Bookmark" -msgstr "Removendo um marcador" +#: C/vinagre.xml:275(title) +msgid "Using Vinagre" +msgstr "Usando o Vinagre" -#: C/vinagre.xml:297(para) -msgid "" -"To remove a bookmark, choose Remove from the " -"context menu of the bookmark in the Side Pane." -msgstr "" -"Para remover um marcador, selecione Remover dos marcadores no menu de contexto do marcador no painel lateral." +#: C/vinagre.xml:278(title) +msgid "To connect to a remote machine" +msgstr "Para se conectar a uma máquina remota" + +#: C/vinagre.xml:281(title) +msgid "Informing a host address" +msgstr "Informando um endereço de máquina" + +#: C/vinagre.xml:282(para) +msgid "To connect with a remote machine, choose CtrlNMachineConnect. The Connection Dialog is displayed. Inform the Protocol and the Host of the connection and click the Connect button. You will see a bunch of options depending on what protocol you have selected." +msgstr "Para conectar-se a uma máquina remota, selecione CtrlNMáquinaConectar. O Diálogo de Conexão será exibido. Informe o Protocolo e a Máquina da conexão e clique no botão Conectar. Você também verá grupos de opções dependendo de que protocolo você selecionou." + +#: C/vinagre.xml:294(title) +msgid "Connect dialog" +msgstr "Diálogo Conectar" + +#: C/vinagre.xml:300(phrase) +msgid "Shows the connect dialog." +msgstr "Mostra o diálogo conectar." + +#: C/vinagre.xml:306(para) +msgid "You can also use the Find button to browse available machines on local network." +msgstr "Você também pode usar o botão Localizar para navegar em máquinas disponíveis na rede local." + +#: C/vinagre.xml:310(para) +msgid "The availabity of the Find button depends on the protocol you have selected. Vinagre relies on Avahi service to browse for machines in your local network. Also, notice that Vinagre can be compiled without Avahi support. In this case, this button will not be available." +msgstr "A disponibilidade do botão Localizar depende do protocolo que você selecionou. O Vinagre se baseia no serviço Avahi para navegar por máquinas na sua rede local. Note também que o Vinagre pode ser compilado sem suporte ao Avahi e, neste caso, este botão não estará disponível." + +#: C/vinagre.xml:318(para) +msgid "Some machines may require a secure connection. In this case, an Authentication dialog will be displayed asking for the credentials. The type of credentials depends on the server. It may be a password and an username. If you check Remember this credential, Vinagre will store the secure information using GNOME Keyring Manager." +msgstr "Algumas máquinas podem requisitar uma conexão segura. Nesse caso, um diálogo Autenticação será exibido e pedirá credenciais. Os tipos de credenciais depende do servidor. Pode ser uma senha e nome de usuário. Se você selecionar Lembrar esta credencial, O Vinagre irá salvar a informação segura usando o Chaveiro do GNOME." + +#: C/vinagre.xml:326(title) +msgid "Authentication dialog" +msgstr "Diálogo de Autenticação" + +#: C/vinagre.xml:332(phrase) +msgid "Shows the authentication dialog." +msgstr "Mostra o diálogo de autenticação." + +#: C/vinagre.xml:337(para) +msgid "If the connection has been used previously, you can also access it by MachineRecent connections...." +msgstr "Se a conexão foi utilizada anteriormente, você poderá também acessá-la por MáquinaConexões recentes...." -#: C/vinagre.xml:304(title) -msgid "To Edit a Bookmark's Properties" -msgstr "Editando as propriedades de um marcador" +#: C/vinagre.xml:347(title) +msgid "Opening a Remote Connection File" +msgstr "Abrindo um arquivo de conexão remota" -#: C/vinagre.xml:305(para) -msgid "" -"To edit a bookmark's properties, such as it's name and host, choose " -"Edit from the context menu of the bookmark in the " -"Side Pane." -msgstr "" -"Para editar as propriedades de um marcador, tais como o seu nome e máquina, " -"selecione Editar marcador no menu de contexto do " -"marcador no painel lateral." +#: C/vinagre.xml:348(para) +msgid "Some hosts distribute remote connection files (generally ending with suffix \".vnc\") instead of inform Host address and Port. To open a remote connection file, choose CtrlOMachineOpen. The Select File dialog is displayed. Select the file you want to open, then click on the Open button." +msgstr "Algumas máquinas distribuem arquivos de conexão remota (geralmente terminados com o sufixo \".vnc\") em vez de fornecer o endereço da Máquina e porta. Para abrir um arquivo de conexão remota, selecione CtrlOMáquinaAbrir. O diálogo Escolha o arquivo será exibido. Selecione o arquivo que quer abrir, e clique no botão Abrir." + +#: C/vinagre.xml:360(para) +msgid "You can also double-click on a remote connection file in the Nautilus file manager to open it on the Vinagre window." +msgstr "Você pode também dar um clique duplo em um arquivo de conexão remota no gerenciador de arquivos Nautilus para abrir na janela do Vinagre." + +#: C/vinagre.xml:367(title) +#: C/vinagre.xml:419(title) +#: C/vinagre.xml:422(title) +msgid "Using Bookmarks" +msgstr "Usando marcadores" + +#: C/vinagre.xml:368(para) +msgid "You can access your mostly used connections through bookmarks. See the Bookmarks chapter." +msgstr "Você pode acessar suas conexões mais acessadas pelos marcadores. Veja o Capítulo Marcadores." -#: C/vinagre.xml:312(title) +#: C/vinagre.xml:376(title) msgid "To Use Full Screen Mode" msgstr "Usando o modo de tela cheia" -#: C/vinagre.xml:313(para) -msgid "" -"To zoom the Display Area to full screen mode, choose " -"F11ViewFull Screen. To exit full " -"screen mode, press F11 or CtrlAlt." -msgstr "" -"Para ampliar a área de exibição para o modo de tela cheia, selecione " -"F11VerTela cheia. Para sair do " -"modo de tela cheia, pressione F11 ou " -"CtrlAlt." +#: C/vinagre.xml:377(para) +msgid "To zoom the Display Area to full screen mode, choose F11ViewFull Screen or the corresponding tool bar button." +msgstr "Para ampliar a área de exibição para o modo de tela cheia, selecione F11VerTela cheia ou o botão correspondente na barra de ferramentas." + +#: C/vinagre.xml:385(para) +msgid "While in full screen mode, move the mouse to the top center of the screen to show a hidden tool bar, which has buttons to leave full screen mode, close the connection and other options." +msgstr "Enquanto estiver no modo tela cheia, mova o mouse para o topo central da tela para mostrar a barra de ferramentas oculta, que tem botões para sair do modo tela cheia, fechar a conexão e outras opções." -#: C/vinagre.xml:324(title) +#: C/vinagre.xml:394(title) msgid "To Close a Connection" msgstr "Fechando uma conexão" -#: C/vinagre.xml:325(para) -msgid "" -"To close a connection, choose MachineClose." -msgstr "" -"Para fechar uma conexão, selecione MáquinaFechar." +#: C/vinagre.xml:395(para) +msgid "To close a connection, choose MachineClose." +msgstr "Para fechar uma conexão, selecione MáquinaFechar." -#: C/vinagre.xml:334(title) +#: C/vinagre.xml:404(title) msgid "To Take Screenshot" msgstr "Capturando imagem da tela" # "capturar uma imagem da tela da área de trabalho remota" teria sido mais # literal, mas redundante. -#: C/vinagre.xml:335(para) -msgid "" -"To take screenshot of the current remote desktop, choose " -"MachineTake Screenshot or press the relative button in the toolbar. The Save " -"Screenshot dialog is displayed, click the Save button to save the screenshot." -msgstr "" -"Para capturar uma imagem da área de trabalho remota, selecione " -"MáquinaCapturar imagem da tela ou pressione o botão adequado na barra de ferramentas. " -"Será apresentado o diálogo Salvar captura de tela, " -"clique então em Salvar para gravar a captura da " -"imagem da tela." +#: C/vinagre.xml:405(para) +msgid "To take screenshot of the current remote desktop, choose MachineTake Screenshot or press the relative button in the toolbar. The Save Screenshot dialog is displayed, click the Save button to save the screenshot." +msgstr "Para capturar uma imagem da área de trabalho remota, selecione MáquinaCapturar imagem da tela ou pressione o botão adequado na barra de ferramentas. Será apresentado o diálogo Salvar captura de tela, clique então em Salvar para salvar a captura da imagem da tela." + +#: C/vinagre.xml:423(para) +msgid "Bookmarks are a resource to keep around machines you access frequently. They are visible at side panel or in the Bookmarks menu." +msgstr "Marcadores são um recurso para manter próximas as máquinas que você acessa frequentemente. Eles estão visíveis no painel lateral ou no menu Marcadores." + +#: C/vinagre.xml:428(title) +msgid "Bookmarks at side panel" +msgstr "Marcadores no painel lateral" + +#: C/vinagre.xml:434(phrase) +msgid "Shows bookmarks at side panel." +msgstr "Mostra marcadores no painel lateral." + +#: C/vinagre.xml:440(para) +msgid "As you move the mouse around the entries, a tooltip will show you the hostname of the connection. To connect to a machine, just double click on a entry." +msgstr "Quando você move o mouse pelas entradas, uma dica de ferramenta irá mostrar-lhe o nome da máquina da conexão. Para conectar-se a uma máquina, simplesmente dê um duplo clique na entrada." -#: C/vinagre.xml:349(title) -msgid "About" -msgstr "Sobre" +#: C/vinagre.xml:447(title) +msgid "To Create a New Bookmark" +msgstr "Criando um novo marcador" -#: C/vinagre.xml:350(para) -msgid "" -"Vinagre was written by Jonh Wendell wendell@bani.com.br. To " -"find more information about Vinagre, please visit the Vinagre web page." -msgstr "" -"Vinagre foi escrito por John Wendell wendell@bani.com.br. " -"Para encontrar mais informações sobre o Vinagre, por favor visite a página Web do " -"Vinagre." +#: C/vinagre.xml:448(para) +msgid "To bookmark the currently viewed connection, choose CtrlDBookmarksAdd to Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and optionally other data, such as the folder and click Save." +msgstr "Para marcar a conexão atualmente visível, selecione CtrlDMarcadoresAdicionar aos marcadores. O diálogo Salvando nos marcadores será exibido. Introduza o nome da conexão e, opcionalmente, outros dados como a pasta, e após isso clique em Salvar." + +#: C/vinagre.xml:458(title) +msgid "Saving a bookmark" +msgstr "Salvando um marcador" + +#: C/vinagre.xml:464(phrase) +msgid "Shows the Saving to Bookmarks dialog." +msgstr "Mostra diálogo Salvando em Marcadores." + +#: C/vinagre.xml:471(para) +msgid "You can use folders to organize your bookmarks. To create a folder, right click in the side panel and choose the option New Folder in the context menu, or go to menu BookmarksNew Folder." +msgstr "Você pode usar pastas para organizar seus marcadores. Para criar uma pasta, clique direito no painel lateral e escolha a opção Nova Pasta no menu de contexto, ou vá para o menu MarcadoresNova Pasta." -#: C/vinagre.xml:356(para) -msgid "" -"To report a bug or make a suggestion regarding this application you can file " -"a bug in our bug tracker." -msgstr "" -"Para relatar um erro ou fazer uma sugestão em relação a esta aplicação, você " -"pode abrir um relatório de erro no nosso sistema de acompanhamento de " -"erros." +#: C/vinagre.xml:484(title) +msgid "To Edit a Bookmark's Properties" +msgstr "Editando as propriedades de um marcador" -#: C/vinagre.xml:362(para) -msgid "" -"This program is distributed 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. A copy of this license " -"can be found at the GNU site, or in the file COPYING included with the source " -"code of this program." -msgstr "" -"Este aplicativo é distribuído sob os termos da Licença Pública Geral GNU tal " -"como publicada pela Free Software Foundation; tanto a versão 2 da Licença, " -"ou (como preferir) qualquer versão posterior. Uma cópia desta licença pode " -"ser encontrada na página web da GNU, ou no arquivo COPYING incluído no código-" -"fonte deste aplicativo." +#: C/vinagre.xml:485(para) +msgid "To edit a bookmark's properties, such as it's name and host, choose Edit bookmark from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed." +msgstr "Para editar as propriedades de um marcador, tais como o seu nome e máquina, selecione Editar marcador do menu de contexto do marcador no painel lateral. O mesmo diálogo mostrado acima será mostrado." + +#: C/vinagre.xml:491(title) +msgid "Editing a bookmark" +msgstr "Editando um marcador" + +#: C/vinagre.xml:497(phrase) +msgid "Context menu option to edit a bookmark" +msgstr "Contexto do menu de opção para editar um marcador" + +#: C/vinagre.xml:503(para) +msgid "You can also edit a folder." +msgstr "Você também pode editar uma pasta." + +#: C/vinagre.xml:507(title) +msgid "To Remove a Bookmark" +msgstr "Removendo um marcador" + +#: C/vinagre.xml:508(para) +msgid "To remove a bookmark, choose Remove from bookmarks from the context menu of the bookmark in the Side Pane." +msgstr "Para remover um marcador, selecione Remover dos marcadores no menu de contexto do marcador no painel lateral." + +#: C/vinagre.xml:512(para) +msgid "You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown." +msgstr "Você também pode remover uma pasta. Note que removendo a pasta será removida todas as entradas. Um diálogo de confirmação será mostrado." + +#: C/vinagre.xml:518(title) +msgid "Preferences" +msgstr "Preferências" + +#: C/vinagre.xml:519(para) +msgid "To configure Vinagre, choose EditPreferences. The Preferences dialog contains the following items:" +msgstr "Para configurar o Vinagre, escolha EditarPreferências. O diálogo Preferências contém os seguintes itens:" + +#: C/vinagre.xml:523(guilabel) +msgid "Always show tabs" +msgstr "Sempre mostrar abas" + +#: C/vinagre.xml:525(para) +msgid "Select this option to make the tabs always visible, even when only one connection is active." +msgstr "Selecione esta opção para tornar as abas sempre visíveis, mesmo quando apenas uma conexão está ativa." + +#: C/vinagre.xml:530(guilabel) +msgid "Show menu shortcuts" +msgstr "Mostrar atalhos do menu" + +#: C/vinagre.xml:532(para) +msgid "By selecting this option, keyboard shortcuts, like Ctrl+D and menu accelerators, like Alt+M to access the Machine menu, will be enabled. This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be working on the remote machine, this option comes disabled by default." +msgstr "Ao selecionar esta opção, atalhos de teclado, como Ctrl+D e aceleradores de menu, como Alt+M para acessar o menu Máquina, serão habilitados. Isto significa que o Vinagre irá capturar as combinações de teclas, em vez de enviá-las para a máquina remota. Como na maioria do tempo você estará trabalhando na máquina remota, esta opção vem desabilitada por padrão." + +#: C/vinagre.xml:543(title) +msgid "About" +msgstr "Sobre" + +#: C/vinagre.xml:544(para) +msgid "Vinagre was written by Jonh Wendell wendell@bani.com.br. To find more information about Vinagre, please visit the Vinagre web page." +msgstr "Vinagre foi escrito por Jonh Wendell wendell@bani.com.br. Para encontrar mais informações sobre o Vinagre, por favor visite a página web do Vinagre." + +#: C/vinagre.xml:549(para) +msgid "To report a bug or make a suggestion regarding this application you can file a bug in our bug tracker." +msgstr "Para relatar um erro ou fazer uma sugestão em relação a esta aplicação, você pode abrir um relatório de erro no nosso sistema de acompanhamento de erros." + +#: C/vinagre.xml:555(para) +msgid "This program is distributed 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. A copy of this license can be found at the GNU site, or in the file COPYING included with the source code of this program." +msgstr "Este aplicativo é distribuído sob os termos da Licença Pública Geral GNU tal como publicada pela Free Software Foundation; tanto a versão 2 da Licença, ou (como preferir) qualquer versão posterior. Uma cópia desta licença pode ser encontrada na página web da GNU, ou no arquivo COPYING incluído no código-fonte deste aplicativo." #. Put one translator per line, in the form of NAME , YEAR1, YEAR2. #: C/vinagre.xml:0(None) msgid "translator-credits" msgstr "" "Leonardo Gregianin , 2008.\n" -"Leonardo Ferreira Fontenelle , 2008." +"Leonardo Ferreira Fontenelle , 2008.\n" +"Krix Apolinário , 2009.\n" +"Rodrigo L. M. Flores , 2009." + +#~ msgid "" +#~ "To report a bug or make a suggestion regarding the Vinagre application or " +#~ "this manual, follow the directions in the Vinagre " +#~ "Contact Page." +#~ msgstr "" +#~ "Para relatar um erro ou fazer uma sugestão em relação ao aplicativo " +#~ "Vinagre ou este manual, siga os passos na Página de Contato do " +#~ "Vinagre." + diff -Nru vinagre-2.26.1/help/pt_BR/vinagre.xml vinagre-2.29.1/help/pt_BR/vinagre.xml --- vinagre-2.26.1/help/pt_BR/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/pt_BR/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,17 +145,23 @@ vinagre - O aplicativo Vinagre é um Visualizador de Área de Trabalho Remota para o Ambiente GNOME. Ele usa o sistema VNC (Virtual Network Computing) para controlar remotamente outro computador. + O aplicativo Vinagre é um Visualizador de Área de Trabalho Remota para o Ambiente GNOME. Ele usa o sistema VNC (Virtual Network Computing) (e possivelmente outros protocolos) para controlar remotamente outro computador. O Vinagre disponibiliza os seguintes recursos: - Conectar-se simultaneamente a várias máquinas. + Conecta-se simultaneamente a várias máquinas. - Salvar conexões recentes e criar marcadores de conexões. + Salva conexões recentes e permite criar marcadores destas. - Descobrir servidores de VNC na rede local. + Descobre máquinas na rede local. + + + Provê um mini-aplicativo no painel do GNOME para acessar rapidamente as suas máquinas marcadas. + + + Extensível através de sua estrutura de plug-ins. @@ -154,7 +173,7 @@ -
+
Iniciando o Vinagre Você pode iniciar o Vinagre das seguintes formas: @@ -172,9 +191,20 @@
- -
- A Janela do Vinagre + + +
+ Iniciando o Vinagre da linha de comando + Você pode executar o Vinagre a partir da linha de comando e conectar a uma única máquina ou múltiplas máquinas. Para se conectar a uma máquina a partir da linha de comando, digite o seguinte comando, então pressione Enter: + vinagre nomedamaquina_ou_endereco_ip + Para obter mais informações sobre como executar o Vinagre a partir da linha de comando, veja a página do manual unix para o Vinagre, Vinagre1. +
+ + + + +
+ A janela do Vinagre
Janela do Vinagre @@ -194,7 +224,7 @@ Barra de menus - Os menus na barra de menu contém todos os comandos de que você necessita para trabalhar com conexões remotas no Vinagre. + Os menus na barra de menus contém todos os comandos de que você necessita para trabalhar com conexões remotas no Vinagre. @@ -218,57 +248,89 @@ Painel lateral - O painel lateral contém uma lista dos marcadores de conexões. + O painel lateral contém uma lista de marcadores de conexões e (se disponível) uma lista de máquinas da rede descobertas automaticamente.
+ +
+ Algumas notas sobre o Vinagre + Como uma ferramenta que acessa outras máquinas, Vinagre se comporta diferentemente de outras aplicações do GNOME na sua instalação padrão. + Vinagre vem com os aceleradores de menu e atalhos de teclado desabilitados por padrão. Isto evita que as teclas sejam interceptadas pelo Vinagre quando você quiser enviar essas teclas para a máquina remota. + Por exemplo, o atalho de teclado para fechar uma aba é Ctrl+W, mas esta combinação será enviada para a máquina remota por padrão. + Se você quer alterar este comportamento, vá para as preferências do Vinagre em EditarPreferências. +
+
Usando o Vinagre
- Conectando-se a uma máquina remota + Para se conectar a uma máquina remota
- Informando o endereço da máquina - Para conectar-se a uma máquina remota, selecione CtrlNMáquinaConectar. O Diálogo de Conexão será exibido. Informe a Máquina e a Porta da conexão e clique no botão Conectar. Você também pode utilizar o botão Localizar para procurar as máquinas disponíveis na rede local. + Informando um endereço de máquina + Para conectar-se a uma máquina remota, selecione CtrlNMáquinaConectar. O Diálogo de Conexão será exibido. Informe o Protocolo e a Máquina da conexão e clique no botão Conectar. Você também verá grupos de opções dependendo de que protocolo você selecionou. + +
+ Diálogo Conectar + + + + + + Mostra o diálogo conectar. + + + +
+ + Você também pode usar o botão Localizar para navegar em máquinas disponíveis na rede local. - Algumas máquinas podem requerer uma conexão segura. Nesse caso, um diálogo Senha será exibido e pedirá a senha da conexão. Se você marcar Lembrar esta senha, o Vinagre irá salvar a informação de segurança utilizando o Gerenciador de Arquivos do GNOME. + A disponibilidade do botão Localizar depende do protocolo que você selecionou. O Vinagre se baseia no serviço Avahi para navegar por máquinas na sua rede local. Note também que o Vinagre pode ser compilado sem suporte ao Avahi e, neste caso, este botão não estará disponível. - Se a conexão foi utilizada previamente, você poderá também acessá-la por MáquinaConexões recentes.... + + Algumas máquinas podem requisitar uma conexão segura. Nesse caso, um diálogo Autenticação será exibido e pedirá credenciais. Os tipos de credenciais depende do servidor. Pode ser uma senha e nome de usuário. Se você selecionar Lembrar esta credencial, O Vinagre irá salvar a informação segura usando o Chaveiro do GNOME. +
+ Diálogo de Autenticação + + + + + + Mostra o diálogo de autenticação. + + +
+ + Se a conexão foi utilizada anteriormente, você poderá também acessá-la por MáquinaConexões recentes....
Abrindo um arquivo de conexão remota - Algumas máquinas distribuem o arquivo de conexão remota (geralmente terminados com o sufixo ".vnc") em vez de fornecerem o endereço da Máquina e da Porta. Para abrir um arquivo de conexão remota, selecione CtrlOMáquinaAbrir. O diálogo Escolha o arquivo será exibido. Selecione o arquivo que quer abrir, e clique no botão Abrir. + Algumas máquinas distribuem arquivos de conexão remota (geralmente terminados com o sufixo ".vnc") em vez de fornecer o endereço da Máquina e porta. Para abrir um arquivo de conexão remota, selecione CtrlOMáquinaAbrir. O diálogo Escolha o arquivo será exibido. Selecione o arquivo que quer abrir, e clique no botão Abrir. Você pode também dar um clique duplo em um arquivo de conexão remota no gerenciador de arquivos Nautilus para abrir na janela do Vinagre.
-
- -
- Criando um novo marcador - Para marcar a conexão atualmente visível, selecione CtrlDMarcadoresAdicionar aos marcadores. O diálogo Salvando nos marcadores será exibido. Introduza o nome da conexão e clique em OK. -
- -
- Removendo um marcador - Para remover um marcador, selecione Remover dos marcadores no menu de contexto do marcador no painel lateral. -
- -
- Editando as propriedades de um marcador - Para editar as propriedades de um marcador, tais como o seu nome e máquina, selecione Editar marcador no menu de contexto do marcador no painel lateral. + +
+ Usando marcadores + Você pode acessar suas conexões mais acessadas pelos marcadores. Veja o Capítulo Marcadores. +
+
- Usando o modo de tela cheia - Para ampliar a área de exibição para o modo de tela cheia, selecione F11VerTela cheia. Para sair do modo de tela cheia, pressione F11 ou CtrlAlt. + Usando o modo de tela cheia + Para ampliar a área de exibição para o modo de tela cheia, selecione F11VerTela cheia ou o botão correspondente na barra de ferramentas. + + Enquanto estiver no modo tela cheia, mova o mouse para o topo central da tela para mostrar a barra de ferramentas oculta, que tem botões para sair do modo tela cheia, fechar a conexão e outras opções. +
@@ -278,16 +340,112 @@
Capturando imagem da tela - Para capturar uma imagem da área de trabalho remota, selecione MáquinaCapturar imagem da tela ou pressione o botão adequado na barra de ferramentas. Será apresentado o diálogo Salvar captura de tela, clique então em Salvar para gravar a captura da imagem da tela. + Para capturar uma imagem da área de trabalho remota, selecione MáquinaCapturar imagem da tela ou pressione o botão adequado na barra de ferramentas. Será apresentado o diálogo Salvar captura de tela, clique então em Salvar para salvar a captura da imagem da tela.
+
+ Usando marcadores + +
+ Usando marcadores + Marcadores são um recurso para manter próximas as máquinas que você acessa frequentemente. Eles estão visíveis no painel lateral ou no menu Marcadores. + +
+ Marcadores no painel lateral + + + + + + Mostra marcadores no painel lateral. + + + +
+ + Quando você move o mouse pelas entradas, uma dica de ferramenta irá mostrar-lhe o nome da máquina da conexão. Para conectar-se a uma máquina, simplesmente dê um duplo clique na entrada. + +
+ +
+ Criando um novo marcador + Para marcar a conexão atualmente visível, selecione CtrlDMarcadoresAdicionar aos marcadores. O diálogo Salvando nos marcadores será exibido. Introduza o nome da conexão e, opcionalmente, outros dados como a pasta, e após isso clique em Salvar. + +
+ Salvando um marcador + + + + + + Mostra diálogo Salvando em Marcadores. + + + +
+ + + Você pode usar pastas para organizar seus marcadores. Para criar uma pasta, clique direito no painel lateral e escolha a opção Nova Pasta no menu de contexto, ou vá para o menu MarcadoresNova Pasta. + + +
+ +
+ Editando as propriedades de um marcador + Para editar as propriedades de um marcador, tais como o seu nome e máquina, selecione Editar marcador do menu de contexto do marcador no painel lateral. O mesmo diálogo mostrado acima será mostrado. + +
+ Editando um marcador + + + + + + Contexto do menu de opção para editar um marcador + + + +
+ + Você também pode editar uma pasta. +
+ +
+ Removendo um marcador + Para remover um marcador, selecione Remover dos marcadores no menu de contexto do marcador no painel lateral. + Você também pode remover uma pasta. Note que removendo a pasta será removida todas as entradas. Um diálogo de confirmação será mostrado. +
+ +
+ +
+ Preferências + Para configurar o Vinagre, escolha EditarPreferências. O diálogo Preferências contém os seguintes itens: + + + + Sempre mostrar abas + + Selecione esta opção para tornar as abas sempre visíveis, mesmo quando apenas uma conexão está ativa. + + + + + Mostrar atalhos do menu + + Ao selecionar esta opção, atalhos de teclado, como Ctrl+D e aceleradores de menu, como Alt+M para acessar o menu Máquina, serão habilitados. Isto significa que o Vinagre irá capturar as combinações de teclas, em vez de enviá-las para a máquina remota. Como na maioria do tempo você estará trabalhando na máquina remota, esta opção vem desabilitada por padrão. + + + +
+
Sobre - Vinagre foi escrito por John Wendell wendell@bani.com.br. Para encontrar mais informações sobre o Vinagre, por favor visite a página Web do Vinagre. - Para relatar um erro ou fazer uma sugestão em relação a esta aplicação, você pode abrir um relatório de erro no nosso sistema de acompanhamento de erros. + Vinagre foi escrito por Jonh Wendell wendell@bani.com.br. Para encontrar mais informações sobre o Vinagre, por favor visite a página web do Vinagre. + Para relatar um erro ou fazer uma sugestão em relação a esta aplicação, você pode abrir um relatório de erro no nosso sistema de acompanhamento de erros. Este aplicativo é distribuído sob os termos da Licença Pública Geral GNU tal como publicada pela Free Software Foundation; tanto a versão 2 da Licença, ou (como preferir) qualquer versão posterior. Uma cópia desta licença pode ser encontrada na página web da GNU, ou no arquivo COPYING incluído no código-fonte deste aplicativo.
diff -Nru vinagre-2.26.1/help/sq/vinagre.xml vinagre-2.29.1/help/sq/vinagre.xml --- vinagre-2.26.1/help/sq/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/sq/vinagre.xml 2009-10-26 13:44:10.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +151,7 @@ vinagre - Aplikativi Vinagre është një shikues desktop-esh në distancë për GNOME desktop që përdor sistemin Virtual Network Computing (VNC) për të kontrolluar në distancë një kompjutër tjetër. + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. Vinagre afron karakteristikat si në vijim: @@ -142,7 +161,13 @@ Regjistron lidhjet e fundit dhe jep mundësinë e shtimit të tyre në libërshënues. - Shfletim i rrjetit lokal për serverët VNC. + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -154,7 +179,7 @@ -
+
Nisja e Vinagre Vinagre mund të niset në menyrat si në vijim: @@ -172,8 +197,19 @@
- -
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
Dritarja e Vinagre
Dritarja e Vinagre @@ -218,26 +254,92 @@ Paneli anësor - Paneli anësor përmban një listë me lidhjet në libërshënues. + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+
Përdorimi i Vinagre
- Lidhja me një makinë në distancë + To connect to a remote machine
- Dhënia e adresës së Host - Për tu lidhur me një makinë në distancë, zgjidh CtrlNMakinaLidhu. Do të shfaqet dritarja me dialogun e lidhjes. Jep Host dhe Portën e lidhjes dhe kliko tek pulsanti Lidhu. Gjithashtu mund të përdoret pulsanti Kërko për të eksploruar makinat e pranishme në rrjetin lokal. + Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + - Disa makina mund të kërkojnë një lidhje të sigurt. Në këtë rast, do të shfaqet një dritare dialogu Fjalëkalimi që do të kërkojë fjalëkalimin për lidhjen. Nëse zgjidhni Kujto këtë fjalëkalim, Vinagre do të regjistrojë informacionin e sigurisë me anë të përdorimit të Manazhuesit të çelsambajtësit të GNOME. + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ Nëse lidhja është përdorur më parë, mund ta përdorni me anë të MakinaLidhjet e fundit....
@@ -249,26 +351,32 @@ Gjithashtu mund të përdoret klik-dyfish mbi një file lidhje në distancë tek manazhuesi i file Nautilus për ta hapur në dritaren e Vinagre.
-
- -
- Krijimi i një libërshënuesi të ri - Për të shtuar në libërshënues lidhjen aktuale, zgjidh CtrlDLibërshënuesShto në libërshënues. Dritarja e dialogut Ruajtje në libërshënues do të shfaqet. Shkruaj emrin e lidhjes dhe kliko tek Ok. -
- -
- Heqja e një libërshënimi - Për të hequr një libërshënues, zgjidh Hiq nga menu përkatëse e libërshënuesit në panelin anësor. -
- -
- Ndryshimi i pronësive të një libërshënuesi - Për të ndryshuar pronësitë e një libërshënuesi, si p.sh. emrin dhe host-in e tij, zgjidh Ndrysho nga menu përkatëse e libërshënuesit në panelin anësor. + +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
- Përdorimi i modalitetit me ekran të plotë - Për të zmadhuar sipërfaqen e shfaqjes sa krejt ekrani, zgjidh F11ShfaqEkran i plotë. Për të dalë nga modaliteti me ekran të plotë, shtyp F11 ose CtrlAlt. + Përdorimi i modalitetit me ekran të plotë + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -284,9 +392,137 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ Krijimi i një libërshënuesi të ri + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ Ndryshimi i pronësive të një libërshënuesi + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ Heqja e një libërshënimi + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
Informacione - Vinagre është shkruar ngaJonh Wendell wendell@bani.com.br. Për informacione të hollësishme në lidhje me Vinagre, vizito faqen web të Vinagre. + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + Për të njoftuar ndonjë difekt apo për dhënë ndonjë propozim në lidhje me këtë program mund të plotësohet një gabim tek tracker i gabimeve. Ky program shpërndahet sipas kushteve të Liçencës Publike të Përgjithshme GNU sikurse publikuar nga Free Software Foundation; sipas versionit 2 të Liçencës, ose (sipas opinionit tuaj) çdo versioni të mëvonshëm. Një kopje e kësaj liçence gjendet tek siti i GNU, ose tek file COPYING përfshirë në kodin burues të këtij programi.
diff -Nru vinagre-2.26.1/help/sv/vinagre.xml vinagre-2.29.1/help/sv/vinagre.xml --- vinagre-2.26.1/help/sv/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/sv/vinagre.xml 2009-10-26 13:44:11.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +151,7 @@ vinagre - Programmet Vinagre är en fjärrskrivbordsklient för GNOME-skrivbordet som använder systemet Virtual Network Computing (VNC) för att fjärrstyra en annan dator. + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. Vinagre tillhandahåller följande funktioner: @@ -142,7 +161,13 @@ Lagra anslutningar och bokmärka dem. - Bläddra i lokala nätverket efter VNC-servrar. + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -154,7 +179,7 @@ -
+
Starta Vinagre Du kan starta Vinagre på följande sätt: @@ -172,8 +197,19 @@
- -
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
Vinagre-fönstret
Vinagre-fönstret @@ -218,26 +254,92 @@ Sidopanel - Sidopanelen innehåller en lista med bokmärkta anslutningar. + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+
Använda Vinagre
- Ansluta till en fjärrdator + To connect to a remote machine
- Ange värdadress - För att ansluta till en fjärrdator kan du välja CtrlNDatorAnslut. En anslutningsdialog kommer att visas. Ange Värd och Port för anslutningen och klicka på knappen Anslut. Du kan även använda knappen Sök för att bläddra bland tillgängliga datorer på det lokala nätverket. + Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + - Vissa datorer kan kräva en säker anslutning. I detta fall kommer dialogen Lösenord att visas som frågar efter anslutningslösenordet. Om du kryssar i Kom ihåg detta lösenord kommer Vinagre att lagra lösenordet med hjälp av GNOME-nyckelringshanterare. + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ Om anslutningen tidigare har använts så kan du även komma åt den via DatorTidigare anslutningar....
@@ -249,26 +351,32 @@ Du kan även dubbelklicka på en fjärranslutningsfil i filhanteraren Nautilus för att öppna den i Vinagre.
-
- -
- Skapa ett nytt bokmärke - För att bokmärka den aktuella anslutningen, välj CtrlDBokmärkenLägg till i bokmärken. Dialogen Sparar till bokmärken kommer att visas. Ange namnet för anslutningen och klicka på OK. -
- -
- Ta bort ett bokmärke - För att ta bort ett bokmärke kan du välja Ta bort från sammanhangsmenyn för bokmärken i sidopanelen. -
- -
- Redigera egenskaperna för ett bokmärke - För att redigera egenskaperna för ett bokmärke, såsom dess namn och värdadress, välj Redigera från sammanhangsmenyn för bokmärket i sidopanelen. + +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
- Använda helskärmsläget - För att växla visningsrutan till helskärmsläget, välj F11VisaHelskärm. För att lämna helskärmsläget, tryck på F11 eller CtrlAlt. + Använda helskärmsläget + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -284,9 +392,137 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ Skapa ett nytt bokmärke + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ Redigera egenskaperna för ett bokmärke + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ Ta bort ett bokmärke + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
Om - Vinagre skrevs av Jonh Wendell wendell@bani.com.br. För att hitta mer information om Vinagre kan du besöka webbsidan för Vinagre. + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + För att rapportera ett fel eller föreslå någonting angående det här programmet så kan du skicka in en felrapport via felhanteringssystemet. Det här programmet distribueras under villkoren för GNU General Public License som publicerats av Free Software Foundation; antingen version 2 av licensen, eller (om du så vill) någon senare version. En kopia av den här licensen kan hittas på GNU:s webbplats, eller i filen COPYING som inkluderats i källkoden för det här programmet.
diff -Nru vinagre-2.26.1/help/th/vinagre.xml vinagre-2.29.1/help/th/vinagre.xml --- vinagre-2.26.1/help/th/vinagre.xml 2009-04-13 14:36:20.000000000 +0100 +++ vinagre-2.29.1/help/th/vinagre.xml 2009-10-26 13:44:11.000000000 +0000 @@ -4,8 +4,8 @@ &app;"> - - + + ]> @@ -132,7 +151,7 @@ vinagre - โปรแกรม Vinagre เป็นเครื่องมือแสดงพื้นโต๊ะเครื่องอื่นของเดสก์ท็อป GNOME โดยใช้ระบบ Virtual Network Computing (VNC) ในการควบคุมคอมพิวเตอร์เครื่องอื่นผ่านเครือข่าย + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. Vinagre มีคุณสมบัติต่าง ๆ ดังต่อไปนี้: @@ -142,7 +161,13 @@ จดจำการเชื่อมต่อล่าสุด และสามารถทำที่คั่นหน้าสำหรับการเชื่อมต่อไว้ได้ - สำรวจหาเซิร์ฟเวอร์ VNC ภายในเครือข่ายเดียวกัน + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. @@ -154,7 +179,7 @@ -
+
เริ่มใช้งาน Vinagre คุณสามารถเริ่มใช้งาน Vinagre ได้ด้วยวิธีต่างๆ ดังนี้: @@ -172,8 +197,19 @@
- -
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
หน้าต่างโปรแกรม Vinagre
หน้าต่างโปรแกรม Vinagre @@ -218,26 +254,92 @@ ช่องด้านข้าง - ช่องด้านข้างจะประกอบด้วยรายชื่อของการเชื่อมต่อที่ได้คั่นหน้าไว้ + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines.
+ +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+
การใช้งาน Vinagre
- การเชื่อมต่อกับเครื่องในเครือข่าย + To connect to a remote machine
- การป้อนที่อยู่โฮสต์ - การเชื่อมต่อไปยังเครื่องอื่น ทำได้โดยเลือก CtrlNเครื่องเชื่อมต่อ จะปรากฏกล่องโต้ตอบ การเชื่อมต่อ ให้คุณป้อน โฮสต์ และ พอร์ต ของเครื่องที่จะเชื่อมต่อ แล้วคลิกปุ่ม เชื่อมต่อ นอกจากนี้ คุณสามารถใช้ปุ่ม หา เพื่อเรียกดูเครื่องต่าง ๆ ที่มีอยู่ในเครือข่ายได้เช่นกัน + Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + - บางเครื่องอาจต้องการการเชื่อมแบบนิรภัย ในกรณีนี้ จะมีกล่องโต้ตอบ รหัสผ่าน ขึ้นมาเพื่อถามรหัสผ่านในการเชื่อมต่อ ถ้าคุณเลือกตัวเลือก จำรหัสผ่านนี้ไว้ โปรแกรม Vinagre จะจดจำข้อมูลรหัสลับไว้ใน เครื่องมือจัดการพวงกุญแจ + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ ถ้าต้องการเชื่อมต่อโฮสต์ที่คุณเคยเชื่อมต่อมาแล้ว คุณสามารถเลือกได้ในเมนู เครื่องการเชื่อมต่อล่าสุด...
@@ -249,26 +351,32 @@ คุณสามารถดับเบิลคลิกที่แฟ้มข้อมูลการเชื่อมต่อเครือข่ายในโปรแกรมจัดการแฟ้ม Nautilus เพื่อเปิดแฟ้มดังกล่าวด้วยโปรแกรม Vinagre ก็ได้
-
- -
- การเพิ่มที่คั่นหน้า - การเพิ่มที่คั่นหน้าสำหรับการเชื่อมต่อที่กำลังเชื่อมต่ออยู่ ทำได้โดยเลือกเมนู CtrlDที่คั่นหน้าเพิ่มในที่คั่นหน้า จะมีกล่องโต้ตอบ การบันทึกที่คั่นหน้า ขึ้นมา ให้ตั้งชื่อการเชื่อมต่อนั้นแล้วคลิก ตกลง -
- -
- การลบที่คั่นหน้า - การลบที่คั่นหน้าการเชื่อมต่อ ทำได้โดยเลือก ลบ จากเมนูคลิกขวาของที่คั่นหน้าที่ต้องการในช่องด้านข้าง -
- -
- การแก้ไขรายละเอียดของที่คั่นหน้า - การแก้ไขรายละเอียดของที่คั่นหน้า เช่น ชื่อ หรือโฮสต์ ทำได้โดยเลือก แก้ไข จากเมนูคลิกขวาของที่คั่นหน้าที่ต้องการในช่องด้านข้าง + +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+
- การใช้โหมดเต็มจอ - การขยายพื้นที่การแสดงผลให้เต็มหน้าจอ ทำได้โดยเลือกเมนู F11มุมมองเต็มจอ ส่วนการยกเลิกการแสดงผลแบบเต็มจอ ให้กดปุ่ม F11 หรือ CtrlAlt + การใช้โหมดเต็มจอ + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + +
@@ -284,9 +392,137 @@
+
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ การเพิ่มที่คั่นหน้า + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ การแก้ไขรายละเอียดของที่คั่นหน้า + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ การลบที่คั่นหน้า + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+
เกี่ยวกับ - โปรแกรม Vinagre พัฒนาโดย Jonh Wendell wendell@bani.com.br สำหรับข้อมูลเพิ่มเติมของ Vinagre โปรดเข้าไปที่ เว็บไซต์ของ Vinagre + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + หากพบปัญหาหรือมีข้อเสนอแนะสำหรับ Vinagre กรุณาแจ้งให้เราทราบได้ที่ เครื่องมือติดตามบั๊ก ของเรา โปรแกรมนี้เผยแพร่ภายใต้เงื่อนไขของ GNU General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา (ตามแต่คุณจะเลือก) รายละเอียดของสัญญาอนุญาต สามารถอ่านได้ที่ เว็บไซต์ของ GNU หรือในแฟ้ม COPYING ที่มาพร้อมกับซอร์สโค้ดของโปรแกรมนี้
diff -Nru vinagre-2.26.1/help/vinagre.pot vinagre-2.29.1/help/vinagre.pot --- vinagre-2.26.1/help/vinagre.pot 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/help/vinagre.pot 2009-12-18 09:12:11.000000000 +0000 @@ -0,0 +1,544 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2009-12-07 19:59+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:212(None) +msgid "@@image: 'figures/vinagre-screenshot.png'; md5=dc88b591b3b8ed3a49335c5431806c13" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:298(None) +msgid "@@image: 'figures/vinagre-connect-dialog.png'; md5=3fc6d3998c0df3fdf5ddcfc9effdd87b" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:330(None) +msgid "@@image: 'figures/vinagre-auth-needed.png'; md5=3cd74cebc8d1d5e2c23b4419e28f6c11" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:432(None) +msgid "@@image: 'figures/vinagre-bookmarks-side-panel.png'; md5=c657cdff0da28c73ac936227e490bb2e" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:462(None) +msgid "@@image: 'figures/vinagre-saving-bookmarks.png'; md5=b99dbef848c5c0d487caecc320ed95de" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:495(None) +msgid "@@image: 'figures/vinagre-editing-bookmarks.png'; md5=ac5097a12572cfce0561f0ca19bb1edb" +msgstr "" + +#: C/vinagre.xml:25(title) +msgid "Vinagre Manual" +msgstr "" + +#: C/vinagre.xml:27(para) +msgid "Vinagre is a Remote Desktop Viewer" +msgstr "" + +#: C/vinagre.xml:32(year) +msgid "2007, 2008, 2009" +msgstr "" + +#: C/vinagre.xml:33(holder) +msgid "Jonh Wendell (wendell@bani.com.br)" +msgstr "" + +#: C/vinagre.xml:49(publishername) +msgid "Jonh Wendell" +msgstr "" + +#: C/vinagre.xml:2(para) +msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." +msgstr "" + +#: C/vinagre.xml:12(para) +msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." +msgstr "" + +#: C/vinagre.xml:19(para) +msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters." +msgstr "" + +#: C/vinagre.xml:35(para) +msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" + +#: C/vinagre.xml:55(para) +msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES." +msgstr "" + +#: C/vinagre.xml:28(para) +msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +msgstr "" + +#: C/vinagre.xml:59(firstname) +msgid "Vinicius" +msgstr "" + +#: C/vinagre.xml:60(surname) +msgid "Depizzol" +msgstr "" + +#: C/vinagre.xml:61(email) +msgid "vdepizzol@gmail.com" +msgstr "" + +#: C/vinagre.xml:65(firstname) +msgid "Jonh" +msgstr "" + +#: C/vinagre.xml:66(surname) +msgid "Wendell" +msgstr "" + +#: C/vinagre.xml:67(email) +msgid "wendell@bani.com.br" +msgstr "" + +#: C/vinagre.xml:86(revnumber) +msgid "0.3" +msgstr "" + +#: C/vinagre.xml:87(date) +msgid "2009-08-23" +msgstr "" + +#: C/vinagre.xml:89(para) +msgid "Jonh Wendell wendell@bani.com.br" +msgstr "" + +#: C/vinagre.xml:95(revnumber) +msgid "0.2" +msgstr "" + +#: C/vinagre.xml:96(date) +msgid "2008-01-15" +msgstr "" + +#: C/vinagre.xml:98(para) +msgid "Vinicius Depizzol vdepizzol@gmail.com" +msgstr "" + +#: C/vinagre.xml:104(revnumber) +msgid "0.1" +msgstr "" + +#: C/vinagre.xml:105(date) +msgid "2007-12-16" +msgstr "" + +#: C/vinagre.xml:107(para) +msgid "Jaap A. Haitsma jaap@haitsma.org" +msgstr "" + +#: C/vinagre.xml:110(para) +msgid "Jaap A. Haitsma" +msgstr "" + +#: C/vinagre.xml:116(title) +msgid "Feedback" +msgstr "" + +#: C/vinagre.xml:117(para) +msgid "To report a bug or make a suggestion regarding the Vinagre application or this manual, please file a bug at GNOME bugzilla page." +msgstr "" + +#: C/vinagre.xml:0(application) C/vinagre.xml:0(application) +msgid "Vinagre" +msgstr "" + +#: C/vinagre.xml:131(primary) +msgid "remote desktop" +msgstr "" + +#: C/vinagre.xml:137(title) +msgid "Introduction" +msgstr "" + +#: C/vinagre.xml:143(secondary) +msgid "Manual" +msgstr "" + +#: C/vinagre.xml:144(tertiary) +msgid "vinagre" +msgstr "" + +#: C/vinagre.xml:147(para) +msgid "The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer." +msgstr "" + +#: C/vinagre.xml:148(para) +msgid "Vinagre provides the following features:" +msgstr "" + +#: C/vinagre.xml:151(para) +msgid "Connect to several machines at the same time." +msgstr "" + +#: C/vinagre.xml:154(para) +msgid "Store recently connections and allows to bookmark them." +msgstr "" + +#: C/vinagre.xml:157(para) +msgid "Browse local network for machines." +msgstr "" + +#: C/vinagre.xml:160(para) +msgid "Provide a GNOME Panel applet to quickly access your bookmarked machines." +msgstr "" + +#: C/vinagre.xml:163(para) +msgid "Extensible through its plugin structure." +msgstr "" + +#: C/vinagre.xml:171(title) +msgid "Getting Started" +msgstr "" + +#: C/vinagre.xml:176(title) +msgid "Starting Vinagre" +msgstr "" + +#: C/vinagre.xml:177(para) +msgid "You can start Vinagre in the following ways:" +msgstr "" + +#: C/vinagre.xml:180(term) +msgid "Applications menu" +msgstr "" + +#: C/vinagre.xml:182(para) +msgid "Choose InternetRemote Desktop Viewer." +msgstr "" + +#: C/vinagre.xml:186(term) +msgid "Command line" +msgstr "" + +#: C/vinagre.xml:188(para) +msgid "Execute the following command: vinagre" +msgstr "" + +#: C/vinagre.xml:196(title) +msgid "Starting Vinagre from a command line" +msgstr "" + +#: C/vinagre.xml:197(para) +msgid "You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return:" +msgstr "" + +#: C/vinagre.xml:198(replaceable) +msgid "hostname_or_ip_address" +msgstr "" + +#: C/vinagre.xml:198(command) +msgid "vinagre " +msgstr "" + +#: C/vinagre.xml:199(para) +msgid "For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1." +msgstr "" + +#: C/vinagre.xml:206(title) +msgid "The Vinagre Window" +msgstr "" + +#: C/vinagre.xml:208(title) +msgid "Vinagre window" +msgstr "" + +#: C/vinagre.xml:214(phrase) +msgid "Shows vinagre main window." +msgstr "" + +#: C/vinagre.xml:220(para) +msgid "The Vinagre window contains the following elements:" +msgstr "" + +#: C/vinagre.xml:225(term) +msgid "Menubar" +msgstr "" + +#: C/vinagre.xml:227(para) +msgid "The menus on the menubar contain all of the commands you need to work with remote connections in Vinagre." +msgstr "" + +#: C/vinagre.xml:231(term) +msgid "Toolbar" +msgstr "" + +#: C/vinagre.xml:233(para) +msgid "The toolbar contains a subset of the most used commands that you can access from the menubar." +msgstr "" + +#: C/vinagre.xml:237(term) +msgid "Display Area" +msgstr "" + +#: C/vinagre.xml:239(para) +msgid "The display area contains a list of tabs with the connected machines and its remote desktops." +msgstr "" + +#: C/vinagre.xml:243(term) +msgid "Statusbar" +msgstr "" + +#: C/vinagre.xml:245(para) +msgid "The statusbar displays information about current Vinagre activity and contextual information about the menu items." +msgstr "" + +#: C/vinagre.xml:249(term) +msgid "Side Pane" +msgstr "" + +#: C/vinagre.xml:251(para) +msgid "The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines." +msgstr "" + +#: C/vinagre.xml:259(title) +msgid "Some notes about Vinagre" +msgstr "" + +#: C/vinagre.xml:260(para) +msgid "As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation." +msgstr "" + +#: C/vinagre.xml:261(para) +msgid "Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine." +msgstr "" + +#: C/vinagre.xml:262(para) +msgid "For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default." +msgstr "" + +#: C/vinagre.xml:263(para) +msgid "If you want to change this behavior, go to Vinagre preferences in EditPreferences." +msgstr "" + +#: C/vinagre.xml:275(title) +msgid "Using Vinagre" +msgstr "" + +#: C/vinagre.xml:278(title) +msgid "To connect to a remote machine" +msgstr "" + +#: C/vinagre.xml:281(title) +msgid "Informing a host address" +msgstr "" + +#: C/vinagre.xml:282(para) +msgid "To connect with a remote machine, choose CtrlNMachineConnect. The Connection Dialog is displayed. Inform the Protocol and the Host of the connection and click the Connect button. You will see a bunch of options depending on what protocol you have selected." +msgstr "" + +#: C/vinagre.xml:294(title) +msgid "Connect dialog" +msgstr "" + +#: C/vinagre.xml:300(phrase) +msgid "Shows the connect dialog." +msgstr "" + +#: C/vinagre.xml:306(para) +msgid "You can also use the Find button to browse available machines on local network." +msgstr "" + +#: C/vinagre.xml:310(para) +msgid "The availabity of the Find button depends on the protocol you have selected. Vinagre relies on Avahi service to browse for machines in your local network. Also, notice that Vinagre can be compiled without Avahi support. In this case, this button will not be available." +msgstr "" + +#: C/vinagre.xml:318(para) +msgid "Some machines may require a secure connection. In this case, an Authentication dialog will be displayed asking for the credentials. The type of credentials depends on the server. It may be a password and an username. If you check Remember this credential, Vinagre will store the secure information using GNOME Keyring Manager." +msgstr "" + +#: C/vinagre.xml:326(title) +msgid "Authentication dialog" +msgstr "" + +#: C/vinagre.xml:332(phrase) +msgid "Shows the authentication dialog." +msgstr "" + +#: C/vinagre.xml:337(para) +msgid "If the connection has been used previously, you can also access it by MachineRecent connections...." +msgstr "" + +#: C/vinagre.xml:347(title) +msgid "Opening a Remote Connection File" +msgstr "" + +#: C/vinagre.xml:348(para) +msgid "Some hosts distribute remote connection files (generally ending with suffix \".vnc\") instead of inform Host address and Port. To open a remote connection file, choose CtrlOMachineOpen. The Select File dialog is displayed. Select the file you want to open, then click on the Open button." +msgstr "" + +#: C/vinagre.xml:360(para) +msgid "You can also double-click on a remote connection file in the Nautilus file manager to open it on the Vinagre window." +msgstr "" + +#: C/vinagre.xml:367(title) C/vinagre.xml:419(title) C/vinagre.xml:422(title) +msgid "Using Bookmarks" +msgstr "" + +#: C/vinagre.xml:368(para) +msgid "You can access your mostly used connections through bookmarks. See the Bookmarks chapter." +msgstr "" + +#: C/vinagre.xml:376(title) +msgid "To Use Full Screen Mode" +msgstr "" + +#: C/vinagre.xml:377(para) +msgid "To zoom the Display Area to full screen mode, choose F11ViewFull Screen or the corresponding tool bar button." +msgstr "" + +#: C/vinagre.xml:385(para) +msgid "While in full screen mode, move the mouse to the top center of the screen to show a hidden tool bar, which has buttons to leave full screen mode, close the connection and other options." +msgstr "" + +#: C/vinagre.xml:394(title) +msgid "To Close a Connection" +msgstr "" + +#: C/vinagre.xml:395(para) +msgid "To close a connection, choose MachineClose." +msgstr "" + +#: C/vinagre.xml:404(title) +msgid "To Take Screenshot" +msgstr "" + +#: C/vinagre.xml:405(para) +msgid "To take screenshot of the current remote desktop, choose MachineTake Screenshot or press the relative button in the toolbar. The Save Screenshot dialog is displayed, click the Save button to save the screenshot." +msgstr "" + +#: C/vinagre.xml:423(para) +msgid "Bookmarks are a resource to keep around machines you access frequently. They are visible at side panel or in the Bookmarks menu." +msgstr "" + +#: C/vinagre.xml:428(title) +msgid "Bookmarks at side panel" +msgstr "" + +#: C/vinagre.xml:434(phrase) +msgid "Shows bookmarks at side panel." +msgstr "" + +#: C/vinagre.xml:440(para) +msgid "As you move the mouse around the entries, a tooltip will show you the hostname of the connection. To connect to a machine, just double click on a entry." +msgstr "" + +#: C/vinagre.xml:447(title) +msgid "To Create a New Bookmark" +msgstr "" + +#: C/vinagre.xml:448(para) +msgid "To bookmark the currently viewed connection, choose CtrlDBookmarksAdd to Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and optionally other data, such as the folder and click Save." +msgstr "" + +#: C/vinagre.xml:458(title) +msgid "Saving a bookmark" +msgstr "" + +#: C/vinagre.xml:464(phrase) +msgid "Shows the Saving to Bookmarks dialog." +msgstr "" + +#: C/vinagre.xml:471(para) +msgid "You can use folders to organize your bookmarks. To create a folder, right click in the side panel and choose the option New Folder in the context menu, or go to menu BookmarksNew Folder." +msgstr "" + +#: C/vinagre.xml:484(title) +msgid "To Edit a Bookmark's Properties" +msgstr "" + +#: C/vinagre.xml:485(para) +msgid "To edit a bookmark's properties, such as it's name and host, choose Edit bookmark from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed." +msgstr "" + +#: C/vinagre.xml:491(title) +msgid "Editing a bookmark" +msgstr "" + +#: C/vinagre.xml:497(phrase) +msgid "Context menu option to edit a bookmark" +msgstr "" + +#: C/vinagre.xml:503(para) +msgid "You can also edit a folder." +msgstr "" + +#: C/vinagre.xml:507(title) +msgid "To Remove a Bookmark" +msgstr "" + +#: C/vinagre.xml:508(para) +msgid "To remove a bookmark, choose Remove from bookmarks from the context menu of the bookmark in the Side Pane." +msgstr "" + +#: C/vinagre.xml:512(para) +msgid "You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown." +msgstr "" + +#: C/vinagre.xml:518(title) +msgid "Preferences" +msgstr "" + +#: C/vinagre.xml:519(para) +msgid "To configure Vinagre, choose EditPreferences. The Preferences dialog contains the following items:" +msgstr "" + +#: C/vinagre.xml:523(guilabel) +msgid "Always show tabs" +msgstr "" + +#: C/vinagre.xml:525(para) +msgid "Select this option to make the tabs always visible, even when only one connection is active." +msgstr "" + +#: C/vinagre.xml:530(guilabel) +msgid "Show menu shortcuts" +msgstr "" + +#: C/vinagre.xml:532(para) +msgid "By selecting this option, keyboard shortcuts, like Ctrl+D and menu accelerators, like Alt+M to access the Machine menu, will be enabled. This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be working on the remote machine, this option comes disabled by default." +msgstr "" + +#: C/vinagre.xml:543(title) +msgid "About" +msgstr "" + +#: C/vinagre.xml:544(para) +msgid "Vinagre was written by Jonh Wendell wendell@bani.com.br. To find more information about Vinagre, please visit the Vinagre web page." +msgstr "" + +#: C/vinagre.xml:549(para) +msgid "To report a bug or make a suggestion regarding this application you can file a bug in our bug tracker." +msgstr "" + +#: C/vinagre.xml:555(para) +msgid "This program is distributed 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. A copy of this license can be found at the GNU site, or in the file COPYING included with the source code of this program." +msgstr "" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/vinagre.xml:0(None) +msgid "translator-credits" +msgstr "" + diff -Nru vinagre-2.26.1/help/zh_CN/vinagre.xml vinagre-2.29.1/help/zh_CN/vinagre.xml --- vinagre-2.26.1/help/zh_CN/vinagre.xml 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/help/zh_CN/vinagre.xml 2009-10-26 13:44:11.000000000 +0000 @@ -0,0 +1,530 @@ + + + + +&app;"> + + +]> + + +
+ + + + + <application>Vinagre</application> 手册 + + Vinagre 是一个远程桌面查看器 + + + 2007, 2008, 2009 + Jonh Wendell (wendell@bani.com.br) + 2009.TeliuTe (teliute@163.com) + + + + + + Jonh Wendell + + + + 对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本，该许可证没有固定的部分、没有封面和背页文本。您可以在此链接上或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副本。 + 本手册是在 GFDL 许可之下分发的 GNOME 手册集合的一部分。如果想要单独分发此手册，可以在手册中添加该许可证的一份副本然后分发，如该许可证的第 6 部分所述。 + + 各个公司使用的许多用于区别它们产品和服务的名称都声明为商标。在所有的 GNOME 文档以及 GNOME 文档项目的成员中，这些名称都是以全大写字母或首字母大写显示，从而表明它们是商标。 + + 本文档以及文档的修改版本都是在遵循 GNU 自由文档许可证的条款下提供，这表示具有以下含义： + + 文档按“原样”提供，不提供任何明示或暗示的保证，包括但不限于：文档或文档的修改版本没有适销性方面的缺陷、适合特定目的的适用性，以及没有侵权行为。您将自行承担本文档以及文档修改版本的质量、准确性以及性能方面的风险。如果任何文档或文档修改版本存在缺陷，您(而不是最初的编写者、作者或撰写人)将承担所有必需的服务、维修或更正的费用。此免责声明是本许可证的重要组成部分。如果不接受此免责声明，那么您就没有权利使用任何文档或文档的修改版本；并且 + + + 无论在任何情况以及在任何法律理论下，本文档或文档修改版本的作者、最初的编写者、任何撰写人或任何分发者，或者任意这些方的任何提供者都不对任何人由于使用本文档或文档修改版本引起或带来的任何直接的、间接的、特殊的、偶然的或继发的损失承担任何民事(包括疏忽)、合同或其它方面的责任，这些损失包括但不限于信誉损失、工作停止、计算机失败或故障，或任何以及所有其它损失或由此引发的或与之相关的损失，即使这些方已被告知存在出现此类损失的可能性时也是如此。 + + + + + + + + + + Vinicius + Depizzol + vdepizzol@gmail.com + + + + Jonh + Wendell + wendell@bani.com.br + + + + + + + + 0.3 + 2009-08-23 + + Jonh Wendell + wendell@bani.com.br + + + + + 0.2 + 2008-01-15 + + Vinicius Depizzol vdepizzol@gmail.com + + + + 0.1 + 2007-12-16 + + Jaap A. Haitsma jaap@haitsma.org + Jaap A. Haitsma + + + + + + 反馈 + + To report a bug or make a suggestion regarding the Vinagre application or + this manual, please file a bug at + GNOME bugzilla page. + + + + + + + Vinagre + + + 远程桌面 + + + + +
+ 介绍 + + + + + Vinagre + 手册 + vinagre 远程桌面查看器 + + + The Vinagre application is a Remote Desktop Viewer for the GNOME desktop that uses Virtual Network Computing (VNC) system (and possibly other protocols) to remotely control another computer. + Vinagre 提供了以下特性： + + + 同时连接多台计算机。 + + + 存储最近的连接，并添加到书签中。 + + + Browse local network for machines. + + + Provide a GNOME Panel applet to quickly access your bookmarked machines. + + + Extensible through its plugin structure. + + + +
+ + +
+ 快速入门 + + + +
+ 运行 Vinagre + 您可以用下面的方法来运行 Vinagre： + + + 应用程序 菜单 + + 点菜单 互联网远程桌面查看器。 + + + + 命令行 + + 运行下面的命令： vinagre + + + +
+ + +
+ Starting Vinagre from a command line + You can run Vinagre from a command line and connect to a single machine or multiple machines. To connect to a machine from a command line, type the following command, then press Return: + vinagre hostname_or_ip_address + For more information on how to run Vinagre from a command line, see the unix manual page for Vinagre, Vinagre1. +
+ + + + +
+ Vinagre 窗口 +
+ Vinagre 窗口 + + + + + + 显示 Vinagre 主窗口。 + + + +
+ + Vinagre 窗口包含下列组件： + + + + 菜单栏 + + 菜单栏里包括在 Vinagre 远程连接时，您可以用到的全部命令。 + + + + 工具栏 + + 工具栏包含您使用最多的菜单命令。 + + + + 显示区 + + 显示区包括连接的计算机列表和远程桌面。 + + + + 状态栏 + + 状态栏显示 Vinagre 活动信息，以及菜单项的相关信息。 + + + + 侧边栏 + + The side pane contains a list of bookmarked connections and (if available) a list of auto-discovered network machines. + + + +
+ + +
+ Some notes about Vinagre + As a tool to access other machines, Vinagre behaves slightly different than other GNOME applications in its default installation. + Vinagre comes with menu accelerators and keyboard shortcuts disabled by default. This avoids keys being intercepted by Vinagre when you wanted to send those keys to the remote machine. + For instance, the keyboard shortcut to close a tab is Ctrl+W, but that key combination will be sent to the remote machine by default. + If you want to change this behavior, go to Vinagre preferences in + + Edit + Preferences + . + + +
+ +
+ +
+ 使用 Vinagre + +
+ To connect to a remote machine + +
+ Informing a host address + To connect with a remote machine, choose + + CtrlN + Machine + Connect + . The Connection Dialog is displayed. + Inform the Protocol and the Host of + the connection and click the Connect button. You will see a bunch of + options depending on what protocol you have selected. + + +
+ Connect dialog + + + + + + Shows the connect dialog. + + + +
+ + + You can also use the Find button to browse available machines on local network. + + + + The availabity of the Find button depends on the protocol you + have selected. Vinagre relies on Avahi service to browse for + machines in your local network. Also, notice that Vinagre can be compiled without + Avahi support. In this case, this button will not be available. + + + + + Some machines may require a secure connection. In this case, an + Authentication dialog will be displayed asking for the credentials. + The type of credentials depends on the server. It may be a password and an username. + If you check Remember this credential, Vinagre will store + the secure information using GNOME Keyring Manager. + +
+ Authentication dialog + + + + + + Shows the authentication dialog. + + +
+ + 如果前面已经连接过，您可以点菜单 计算机最近连接... 查找。 +
+ +
+ 打开一个远程连接文件 + 一些主机会发布远程连接文件(通常是以“.vnc”结尾)，而不是主机地址和端口。要打开一个远程连接文件，点菜单 CtrlO计算机打开，出来一个 选择文件 对话框。选中您想打开的文件，然后点 打开 按钮。 + + + 您也可以在 Nautilus 文件管理器里，双击一个远程连接文件打开 Vinagre 窗口。 + +
+ +
+ Using Bookmarks + You can access your mostly used connections through bookmarks. See the + Bookmarks chapter. + +
+ +
+ +
+ 使用全屏模式 + To zoom the Display Area to full screen mode, choose + + F11 + View + Full Screen + or the corresponding tool bar button. + + + + While in full screen mode, move the mouse to the top center of the screen + to show a hidden tool bar, which has buttons to leave full screen mode, + close the connection and other options. + + +
+ +
+ 关闭一个连接 + 要关闭一个连接，点菜单 计算机关闭。 +
+ +
+ 抓取屏幕图片 + 要抓取当前远程桌面的图片，点菜单 计算机抓图 或者点一下工具栏上相应的按钮，在出来的 保存抓图 对话框里，点 保存 按钮，保存抓取的图片。 +
+ +
+ + +
+ Using Bookmarks + +
+ Using Bookmarks + Bookmarks are a resource to keep around machines you access frequently. + They are visible at side panel or in the Bookmarks menu. + + +
+ Bookmarks at side panel + + + + + + Shows bookmarks at side panel. + + + +
+ + As you move the mouse around the entries, a tooltip will show you the hostname + of the connection. To connect to a machine, just double click on a entry. + + +
+ +
+ 创建一个新的书签 + To bookmark the currently viewed connection, choose + + CtrlD + Bookmarks + Add to Bookmarks + . The Saving to Bookmarks dialog is displayed. + Inform the name of the connection and optionally other data, such as the folder and click Save. + + +
+ Saving a bookmark + + + + + + Shows the Saving to Bookmarks dialog. + + + +
+ + + You can use folders to organize your bookmarks. To create a folder, right click + in the side panel and choose the option New Folder in the context menu, + or go to menu + + Bookmarks + New Folder + . + + + +
+ +
+ 编辑一个书签的属性 + + To edit a bookmark's properties, such as it's name and host, choose Edit bookmark + from the context menu of the bookmark in the Side Pane. The same dialog as shown above will be displayed. + + +
+ Editing a bookmark + + + + + + Context menu option to edit a bookmark + + + +
+ + You can also edit a folder. +
+ +
+ 删除一个书签 + + To remove a bookmark, choose Remove from bookmarks from the context menu + of the bookmark in the Side Pane. + + You can also remove a folder. Notice that removing a folder will remove all its entries. A confirmation dialog will be shown. +
+ +
+ +
+ Preferences + To configure Vinagre, choose Edit Preferences . The Preferences dialog contains the following items: + + + + Always show tabs + + Select this option to make the tabs always visible, even when only one connection is active. + + + + + Show menu shortcuts + + By selecting this option, keyboard shortcuts, like Ctrl+D + and menu accelerators, like Alt+M to access the Machine menu, will be enabled. + This means that Vinagre will catch those key combinations, instead of sending them to the remote machine. Because most of the time you will be + working on the remote machine, this option comes disabled by default. + + + + +
+ +
+ 关于 + + Vinagre was written by Jonh Wendell wendell@bani.com.br. + To find more information about Vinagre, please visit the + Vinagre web page. + + 要报告这个程序的错误或提出建议，请发送报告文件到我们的 bug 缺陷跟踪。 + 本程序依照自由软件基金会所发表的 GNU GPL 协议发行；使用第二版或者(如果您愿意)以后版本。协议的副本可以在 GNU 站点 上找到，或者在包含在本程序源代码的 COPYING 文件中。 +
+ +
diff -Nru vinagre-2.26.1/help/zh_CN/zh_CN.po vinagre-2.29.1/help/zh_CN/zh_CN.po --- vinagre-2.26.1/help/zh_CN/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/help/zh_CN/zh_CN.po 2009-10-26 13:44:11.000000000 +0000 @@ -0,0 +1,547 @@ +# Simplified Chinese translation for vinagre. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the vinagre package. +# TeliuTe , 2009. +msgid "" +msgstr "" +"Project-Id-Version: vinagre-help.master\n" +"POT-Creation-Date: 2009-04-17 15:52+0000\n" +"PO-Revision-Date: 2009-04-20 00:09+0600\n" +"Last-Translator: TeliuTe \n" +"Language-Team: Chinese (simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/vinagre.xml:180(None) +msgid "" +"@@image: 'figures/vinagre-screenshot.png'; " +"md5=5ea2ba4ba469dadea877f19b6b33ced2" +msgstr "" +"@@image: 'figures/vinagre-screenshot.png'; " +"md5=5ea2ba4ba469dadea877f19b6b33ced2" + +#: C/vinagre.xml:25(title) +msgid "Vinagre Manual" +msgstr "Vinagre 手册" + +#: C/vinagre.xml:27(para) +msgid "Vinagre is a Remote Desktop Viewer" +msgstr "Vinagre 是一个远程桌面查看器" + +#: C/vinagre.xml:32(year) +msgid "2007, 2008" +msgstr "2007，2008" + +#: C/vinagre.xml:33(holder) +msgid "Jonh Wendell (wendell@bani.com.br)" +msgstr "Jonh Wendell (wendell@bani.com.br)" + +#: C/vinagre.xml:49(publishername) +msgid "Jonh Wendell" +msgstr "Jonh Wendell" + +#: C/vinagre.xml:2(para) +msgid "" +"Permission is granted to copy, distribute and/or modify this document under " +"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " +"later version published by the Free Software Foundation with no Invariant " +"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " +"of the GFDL at this link or " +"in the file COPYING-DOCS distributed with this manual." +msgstr "" +"对于本文档的复制、分发和/或修改必须遵循自由软件基金会 (Free Software " +"Foundation) 发布的 GNU 自由文档许可证 (GFDL) 版本 1.1 或更高版本，该许可证没" +"有固定的部分、没有封面和背页文本。您可以在此链接上或在随本手册一起分发的 COPYING-DOCS 文件中找到 GFDL 的副" +"本。" + +#: C/vinagre.xml:12(para) +msgid "" +"This manual is part of a collection of GNOME manuals distributed under the " +"GFDL. If you want to distribute this manual separately from the collection, " +"you can do so by adding a copy of the license to the manual, as described in " +"section 6 of the license." +msgstr "" +"本手册是在 GFDL 许可之下分发的 GNOME 手册集合的一部分。如果想要单独分发此手" +"册，可以在手册中添加该许可证的一份副本然后分发，如该许可证的第 6 部分所述。" + +#: C/vinagre.xml:19(para) +msgid "" +"Many of the names used by companies to distinguish their products and " +"services are claimed as trademarks. Where those names appear in any GNOME " +"documentation, and the members of the GNOME Documentation Project are made " +"aware of those trademarks, then the names are in capital letters or initial " +"capital letters." +msgstr "" +"各个公司使用的许多用于区别它们产品和服务的名称都声明为商标。在所有的 GNOME 文" +"档以及 GNOME 文档项目的成员中，这些名称都是以全大写字母或首字母大写显示，从而" +"表明它们是商标。" + +#: C/vinagre.xml:35(para) +msgid "" +"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " +"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " +"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS " +"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE " +"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " +"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " +"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " +"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " +"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " +"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " +"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" +"文档按“原样”提供，不提供任何明示或暗示的保证，包括但不限于：文档或文档的修改" +"版本没有适销性方面的缺陷、适合特定目的的适用性，以及没有侵权行为。您将自行承" +"担本文档以及文档修改版本的质量、准确性以及性能方面的风险。如果任何文档或文档" +"修改版本存在缺陷，您(而不是最初的编写者、作者或撰写人)将承担所有必需的服务、" +"维修或更正的费用。此免责声明是本许可证的重要组成部分。如果不接受此免责声明，" +"那么您就没有权利使用任何文档或文档的修改版本；并且" + +#: C/vinagre.xml:55(para) +msgid "" +"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " +"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " +"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE " +"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON " +"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF " +"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, " +"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES " +"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " +"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " +"POSSIBILITY OF SUCH DAMAGES." +msgstr "" +"无论在任何情况以及在任何法律理论下，本文档或文档修改版本的作者、最初的编写" +"者、任何撰写人或任何分发者，或者任意这些方的任何提供者都不对任何人由于使用本" +"文档或文档修改版本引起或带来的任何直接的、间接的、特殊的、偶然的或继发的损失" +"承担任何民事(包括疏忽)、合同或其它方面的责任，这些损失包括但不限于信誉损失、" +"工作停止、计算机失败或故障，或任何以及所有其它损失或由此引发的或与之相关的损" +"失，即使这些方已被告知存在出现此类损失的可能性时也是如此。" + +#: C/vinagre.xml:28(para) +msgid "" +"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS " +"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +"" +msgstr "" +"本文档以及文档的修改版本都是在遵循 GNU 自由文档许可证的条款下提供，这表示具有" +"以下含义：" + +#: C/vinagre.xml:59(firstname) +msgid "Vinicius" +msgstr "Vinicius" + +#: C/vinagre.xml:60(surname) +msgid "Depizzol" +msgstr "Depizzol" + +#: C/vinagre.xml:61(email) +msgid "vdepizzol@gmail.com" +msgstr "vdepizzol@gmail.com" + +#: C/vinagre.xml:80(revnumber) +msgid "0.2" +msgstr "0.2" + +#: C/vinagre.xml:81(date) +msgid "2008-01-15" +msgstr "2008-01-15" + +#: C/vinagre.xml:83(para) +msgid "Vinicius Depizzol vdepizzol@gmail.com" +msgstr "Vinicius Depizzol vdepizzol@gmail.com" + +#: C/vinagre.xml:89(revnumber) +msgid "0.1" +msgstr "0.1" + +#: C/vinagre.xml:90(date) +msgid "2007-12-16" +msgstr "2007-12-16" + +#: C/vinagre.xml:92(para) +msgid "Jaap A. Haitsma jaap@haitsma.org" +msgstr "Jaap A. Haitsma jaap@haitsma.org" + +#: C/vinagre.xml:95(para) +msgid "Jaap A. Haitsma" +msgstr "Jaap A. Haitsma" + +#: C/vinagre.xml:101(title) +msgid "Feedback" +msgstr "反馈" + +#: C/vinagre.xml:102(para) +msgid "" +"To report a bug or make a suggestion regarding the Vinagre application or " +"this manual, follow the directions in the Vinagre Contact " +"Page." +msgstr "" +"要报告关于 Vinagre 或使用手册中的缺陷，或者提出建议，请参照 GNOME 反馈页 上的指导。" + +#: C/vinagre.xml:0(application) +msgid "Vinagre" +msgstr "Vinagre" + +#: C/vinagre.xml:116(primary) +msgid "remote desktop" +msgstr "远程桌面" + +#: C/vinagre.xml:122(title) +msgid "Introduction" +msgstr "介绍" + +#: C/vinagre.xml:128(secondary) +msgid "Manual" +msgstr "手册" + +#: C/vinagre.xml:129(tertiary) +msgid "vinagre" +msgstr "vinagre 远程桌面查看器" + +#: C/vinagre.xml:132(para) +msgid "" +"The Vinagre application is a Remote Desktop Viewer for the GNOME " +"desktop that uses Virtual Network Computing (VNC) system to " +"remotely control another computer." +msgstr "" +"Vinagre 是一个用于 GNOME 桌面 的远程桌面查看器，使用" +"虚拟网络计算(VNC)系统来远程控制其他计算机。" + +#: C/vinagre.xml:133(para) +msgid "Vinagre provides the following features:" +msgstr "Vinagre 提供了以下特性：" + +#: C/vinagre.xml:136(para) +msgid "Connect to several machines at the same time." +msgstr "同时连接多台计算机。" + +#: C/vinagre.xml:139(para) +msgid "Store recently connections and allows to bookmark them." +msgstr "存储最近的连接，并添加到书签中。" + +#: C/vinagre.xml:142(para) +msgid "Browse local network for VNC Servers." +msgstr "浏览本地网络查找 VNC 服务器" + +#: C/vinagre.xml:150(title) +msgid "Getting Started" +msgstr "快速入门" + +#: C/vinagre.xml:155(title) +msgid "Starting Vinagre" +msgstr "运行 Vinagre" + +#: C/vinagre.xml:156(para) +msgid "You can start Vinagre in the following ways:" +msgstr "您可以用下面的方法来运行 Vinagre：" + +#: C/vinagre.xml:159(term) +msgid "Applications menu" +msgstr "应用程序 菜单" + +#: C/vinagre.xml:161(para) +msgid "" +"Choose InternetRemote " +"Desktop Viewer." +msgstr "" +"点菜单 互联网远程桌面查看器" +"。" + +#: C/vinagre.xml:165(term) +msgid "Command line" +msgstr "命令行" + +#: C/vinagre.xml:167(para) +msgid "Execute the following command: vinagre" +msgstr "运行下面的命令： vinagre" + +#: C/vinagre.xml:174(title) +msgid "The Vinagre Window" +msgstr "Vinagre 窗口" + +#: C/vinagre.xml:176(title) +msgid "Vinagre window" +msgstr "Vinagre 窗口" + +#: C/vinagre.xml:182(phrase) +msgid "Shows vinagre main window." +msgstr "显示 Vinagre 主窗口。" + +#: C/vinagre.xml:188(para) +msgid "" +"The Vinagre window contains the following " +"elements:" +msgstr "Vinagre 窗口包含下列组件：" + +#: C/vinagre.xml:193(term) +msgid "Menubar" +msgstr "菜单栏" + +#: C/vinagre.xml:195(para) +msgid "" +"The menus on the menubar contain all of the commands you need to work with " +"remote connections in Vinagre." +msgstr "" +"菜单栏里包括在 Vinagre 远程连接时，您可以用到的全" +"部命令。" + +#: C/vinagre.xml:199(term) +msgid "Toolbar" +msgstr "工具栏" + +#: C/vinagre.xml:201(para) +msgid "" +"The toolbar contains a subset of the most used commands that you can access " +"from the menubar." +msgstr "工具栏包含您使用最多的菜单命令。" + +#: C/vinagre.xml:205(term) +msgid "Display Area" +msgstr "显示区" + +#: C/vinagre.xml:207(para) +msgid "" +"The display area contains a list of tabs with the connected machines and its " +"remote desktops." +msgstr "显示区包括连接的计算机列表和远程桌面。" + +#: C/vinagre.xml:211(term) +msgid "Statusbar" +msgstr "状态栏" + +#: C/vinagre.xml:213(para) +msgid "" +"The statusbar displays information about current Vinagre activity and contextual information about the menu items." +msgstr "" +"状态栏显示 Vinagre 活动信息，以及菜单项的相关信" +"息。" + +#: C/vinagre.xml:217(term) +msgid "Side Pane" +msgstr "侧边栏" + +#: C/vinagre.xml:219(para) +msgid "The side pane contains a list of bookmarked connections." +msgstr "侧边栏包含一个列表，里面是各个连接的书签。" + +#: C/vinagre.xml:228(title) +msgid "Using Vinagre" +msgstr "使用 Vinagre" + +#: C/vinagre.xml:231(title) +msgid "To connect with a remote machine" +msgstr "要连接到一台远程计算机" + +#: C/vinagre.xml:234(title) +msgid "Informing Host address" +msgstr "主机地址信息" + +#: C/vinagre.xml:235(para) +msgid "" +"To connect with a remote machine, choose " +"CtrlNMachineConnect. The Connection Dialog is " +"displayed. Inform the Host and the Port of the connection and click the Connect " +"button. You can also use the Find button to browse " +"available machines on local network." +msgstr "" +"要连接到一个远程计算机，点菜单 CtrlN计算机连接，出来一个 连接" +" 对话框。输入 主机 和 端口，然后点 连接 按钮。您也可以使用 " +"查找 按钮，浏览本地网络中可用的计算机。" + +#: C/vinagre.xml:246(para) +msgid "" +"Some machines may require a secure connection. In this case, a " +"Password dialog will be displayed asking for the " +"connection password. If you check Remember this password, Vinagre will store the secure " +"information using GNOME Keyring Manager." +msgstr "" +"一些计算机需要安全连接，因此，会出来一个 密码 对话框，提" +"示输入连接密码。如果您选中 记住密码， " +"Vinagre 将使用 GNOME 密钥管理器 保存这个安全信息。" + +#: C/vinagre.xml:253(para) +msgid "" +"If the connection has been used previously, you can also access it by " +"MachineRecent connections...." +msgstr "" +"如果前面已经连接过，您可以点菜单 计算机最近连接... 查找。" + +#: C/vinagre.xml:263(title) +msgid "Opening a Remote Connection File" +msgstr "打开一个远程连接文件" + +#: C/vinagre.xml:264(para) +msgid "" +"Some hosts distribute remote connection files (generally ending with suffix " +"\".vnc\") instead of inform Host address and Port. To open a remote " +"connection file, choose CtrlOMachineOpen. The Select " +"File dialog is displayed. Select the file you want to open, then " +"click on the Open button." +msgstr "" +"一些主机会发布远程连接文件(通常是以“.vnc”结尾)，而不是主机地址和端口。要打开" +"一个远程连接文件，点菜单 CtrlO计算机打开，出来一个 选择" +"文件 对话框。选中您想打开的文件，然后点 打开 按钮。" + +#: C/vinagre.xml:276(para) +msgid "" +"You can also double-click on a remote connection file in the " +"Nautilus file manager to open it on the " +"Vinagre window." +msgstr "" +"您也可以在 Nautilus 文件管理器里，双击一个远程连接" +"文件打开 Vinagre 窗口。" + +#: C/vinagre.xml:284(title) +msgid "To Create a New Bookmark" +msgstr "创建一个新的书签" + +#: C/vinagre.xml:285(para) +msgid "" +"To bookmark the currently viewed connection, choose " +"CtrlDBookmarksAdd to " +"Bookmarks. The Saving to Bookmarks dialog is displayed. Inform the name of the connection and click " +"Ok." +msgstr "" +"要添加当前查看的连接为书签，点菜单 " +"CtrlD书签添加到书签，出来一个 保存为书签 对话框，" +"输入连接的名称，然后点 确定。" + +#: C/vinagre.xml:296(title) +msgid "To Remove a Bookmark" +msgstr "删除一个书签" + +#: C/vinagre.xml:297(para) +msgid "" +"To remove a bookmark, choose Remove from the " +"context menu of the bookmark in the Side Pane." +msgstr "" +"要删除一个书签，在侧边栏里瞄准点右键，选 删除 。" + +#: C/vinagre.xml:304(title) +msgid "To Edit a Bookmark's Properties" +msgstr "编辑一个书签的属性" + +#: C/vinagre.xml:305(para) +msgid "" +"To edit a bookmark's properties, such as it's name and host, choose " +"Edit from the context menu of the bookmark in the " +"Side Pane." +msgstr "" +"要编辑一个书签的属性，比如主机名称等，在侧边栏里瞄准点右键，选 " +"编辑 命令。" + +#: C/vinagre.xml:312(title) +msgid "To Use Full Screen Mode" +msgstr "使用全屏模式" + +#: C/vinagre.xml:313(para) +msgid "" +"To zoom the Display Area to full screen mode, choose " +"F11ViewFull Screen. To exit full " +"screen mode, press F11 or CtrlAlt." +msgstr "" +"要放大显示区域进入全屏模式，点菜单 F11查看全屏。要退出全屏模式，按 F11 或者 " +"CtrlAlt 组合键。" + +#: C/vinagre.xml:324(title) +msgid "To Close a Connection" +msgstr "关闭一个连接" + +#: C/vinagre.xml:325(para) +msgid "" +"To close a connection, choose MachineClose." +msgstr "" +"要关闭一个连接，点菜单 计算机关闭" +"。" + +#: C/vinagre.xml:334(title) +msgid "To Take Screenshot" +msgstr "抓取屏幕图片" + +#: C/vinagre.xml:335(para) +msgid "" +"To take screenshot of the current remote desktop, choose " +"MachineTake Screenshot or press the relative button in the toolbar. The Save " +"Screenshot dialog is displayed, click the Save button to save the screenshot." +msgstr "" +"要抓取当前远程桌面的图片，点菜单 计算机抓图 或者点一下工具栏上相应的按钮，在" +"出来的 保存抓图 对话框里，点 保存 按钮，保存抓取的图片。" + +#: C/vinagre.xml:349(title) +msgid "About" +msgstr "关于" + +#: C/vinagre.xml:350(para) +msgid "" +"Vinagre was written by Jonh Wendell wendell@bani.com.br. To " +"find more information about Vinagre, please visit the Vinagre web page." +msgstr "" +"Vinagre 由 Jonh Wendell wendell@bani.com.br 编写，要了解更多相" +"关信息，请访问Vinagre 页面。" + +#: C/vinagre.xml:356(para) +msgid "" +"To report a bug or make a suggestion regarding this application you can file " +"a bug in our bug tracker." +msgstr "" +"要报告这个程序的错误或提出建议，请发送报告文件到我们的 bug 缺陷跟踪。" + +#: C/vinagre.xml:362(para) +msgid "" +"This program is distributed 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. A copy of this license " +"can be found at the GNU site, or in the file COPYING included with the source " +"code of this program." +msgstr "" +"本程序依照自由软件基金会所发表的 GNU GPL 协议发行；使用第二版或者(如果您愿意)" +"以后版本。协议的副本可以在 GNU 站点 上找到，或者在包含在本程序源代码的 COPYING " +"文件中。" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2. +#: C/vinagre.xml:0(None) +msgid "translator-credits" +msgstr "TeliuTe , 2009." diff -Nru vinagre-2.26.1/INSTALL vinagre-2.29.1/INSTALL --- vinagre-2.26.1/INSTALL 2008-12-16 13:55:50.000000000 +0000 +++ vinagre-2.29.1/INSTALL 2009-10-22 12:56:47.000000000 +0100 @@ -1,19 +1,291 @@ -Vinagre Installation Instructions -================================= +Installation Instructions +************************* -You need the devel packages of the following libraries: +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. - - gtk+ >= 2.14 - - glib >= 2.18 - - libglade-2.0 - - gconf-2.0 - - gnome-keyring - - gtk-vnc widget >= 0.3.8 (http://sourceforge.net/projects/gtk-vnc) - - avahi-gobject and avahi-ui >= 0.6.22 - - libpanelapplet-2.0 >= 2.0.0 - -To compile it, just do: - -./configure [--prefix=/usr] -make -make install (as root, or with sudo) diff -Nru vinagre-2.26.1/install-sh vinagre-2.29.1/install-sh --- vinagre-2.26.1/install-sh 2009-04-13 14:35:35.000000000 +0100 +++ vinagre-2.29.1/install-sh 2009-10-26 13:35:25.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -515,5 +515,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru vinagre-2.26.1/intltool-extract.in vinagre-2.29.1/intltool-extract.in --- vinagre-2.26.1/intltool-extract.in 2009-04-13 14:35:26.000000000 +0100 +++ vinagre-2.29.1/intltool-extract.in 2009-10-26 13:35:18.000000000 +0000 @@ -1,875 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Extractor -# -# Copyright (C) 2000-2001, 2003 Free Software Foundation. -# -# Intltool 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. -# -# Intltool 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Kenneth Christiansen -# Darin Adler -# - -## Release information -my $PROGRAM = "intltool-extract"; -my $PACKAGE = "intltool"; -my $VERSION = "0.37.1"; - -## Loaded modules -use strict; -use File::Basename; -use Getopt::Long; - -## Scalars used by the option stuff -my $TYPE_ARG = "0"; -my $LOCAL_ARG = "0"; -my $HELP_ARG = "0"; -my $VERSION_ARG = "0"; -my $UPDATE_ARG = "0"; -my $QUIET_ARG = "0"; -my $SRCDIR_ARG = "."; - -my $FILE; -my $OUTFILE; - -my $gettext_type = ""; -my $input; -my %messages = (); -my %loc = (); -my %count = (); -my %comments = (); -my $strcount = 0; - -my $XMLCOMMENT = ""; - -## Use this instead of \w for XML files to handle more possible characters. -my $w = "[-A-Za-z0-9._:]"; - -## Always print first -$| = 1; - -## Handle options -GetOptions ( - "type=s" => \$TYPE_ARG, - "local|l" => \$LOCAL_ARG, - "help|h" => \$HELP_ARG, - "version|v" => \$VERSION_ARG, - "update" => \$UPDATE_ARG, - "quiet|q" => \$QUIET_ARG, - "srcdir=s" => \$SRCDIR_ARG, - ) or &error; - -&split_on_argument; - - -## Check for options. -## This section will check for the different options. - -sub split_on_argument { - - if ($VERSION_ARG) { - &version; - - } elsif ($HELP_ARG) { - &help; - - } elsif ($LOCAL_ARG) { - &place_local; - &extract; - - } elsif ($UPDATE_ARG) { - &place_normal; - &extract; - - } elsif (@ARGV > 0) { - &place_normal; - &message; - &extract; - - } else { - &help; - - } -} - -sub place_normal { - $FILE = $ARGV[0]; - $OUTFILE = "$FILE.h"; - - my $dirname = dirname ($OUTFILE); - if (! -d "$dirname" && $dirname ne "") { - system ("mkdir -p $dirname"); - } -} - -sub place_local { - $FILE = $ARGV[0]; - $OUTFILE = fileparse($FILE, ()); - if (!-e "tmp/") { - system("mkdir tmp/"); - } - $OUTFILE = "./tmp/$OUTFILE.h" -} - -sub determine_type { - if ($TYPE_ARG =~ /^gettext\/(.*)/) { - $gettext_type=$1 - } -} - -## Sub for printing release information -sub version{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) $VERSION -Copyright (C) 2000, 2003 Free Software Foundation, Inc. -Written by Kenneth Christiansen, 2000. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -## Sub for printing usage information -sub help { - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... [FILENAME] -Generates a header file from an XML source file. - -It grabs all strings between <_translatable_node> and its end tag in -XML files. Read manpage (man ${PROGRAM}) for more info. - - --type=TYPE Specify the file type of FILENAME. Currently supports: - "gettext/glade", "gettext/ini", "gettext/keys" - "gettext/rfc822deb", "gettext/schemas", - "gettext/scheme", "gettext/xml", "gettext/quoted", - "gettext/quotedxml" - -l, --local Writes output into current working directory - (conflicts with --update) - --update Writes output into the same directory the source file - reside (conflicts with --local) - --srcdir Root of the source tree - -v, --version Output version information and exit - -h, --help Display this help and exit - -q, --quiet Quiet mode - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - -## Sub for printing error messages -sub error{ - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit; -} - -sub message { - print "Generating C format header file for translation.\n" unless $QUIET_ARG; -} - -sub extract { - &determine_type; - - &convert; - - open OUT, ">$OUTFILE"; - binmode (OUT) if $^O eq 'MSWin32'; - &msg_write; - close OUT; - - print "Wrote $OUTFILE\n" unless $QUIET_ARG; -} - -sub convert { - - ## Reading the file - { - local (*IN); - local $/; #slurp mode - open (IN, "<$SRCDIR_ARG/$FILE") || die "can't open $SRCDIR_ARG/$FILE: $!"; - $input = ; - } - - &type_ini if $gettext_type eq "ini"; - &type_keys if $gettext_type eq "keys"; - &type_xml if $gettext_type eq "xml"; - &type_glade if $gettext_type eq "glade"; - &type_scheme if $gettext_type eq "scheme"; - &type_schemas if $gettext_type eq "schemas"; - &type_rfc822deb if $gettext_type eq "rfc822deb"; - &type_quoted if $gettext_type eq "quoted"; - &type_quotedxml if $gettext_type eq "quotedxml"; -} - -sub entity_decode_minimal -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/&/&/g; - - return $_; -} - -sub entity_decode -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/<//g; - s/&/&/g; - - return $_; -} - -sub escape_char -{ - return '\"' if $_ eq '"'; - return '\n' if $_ eq "\n"; - return '\\\\' if $_ eq '\\'; - - return $_; -} - -sub escape -{ - my ($string) = @_; - return join "", map &escape_char, split //, $string; -} - -sub type_ini { - ### For generic translatable desktop files ### - while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) { - if (defined($2)) { - $comments{$3} = $2; - } - $messages{$3} = []; - } -} - -sub type_keys { - ### For generic translatable mime/keys files ### - while ($input =~ /^\s*_\w+=(.*)$/mg) { - $messages{$1} = []; - } -} - -sub type_xml { - ### For generic translatable XML files ### - my $tree = readXml($input); - parseTree(0, $tree); -} - -sub print_var { - my $var = shift; - my $vartype = ref $var; - - if ($vartype =~ /ARRAY/) { - my @arr = @{$var}; - print "[ "; - foreach my $el (@arr) { - print_var($el); - print ", "; - } - print "] "; - } elsif ($vartype =~ /HASH/) { - my %hash = %{$var}; - print "{ "; - foreach my $key (keys %hash) { - print "$key => "; - print_var($hash{$key}); - print ", "; - } - print "} "; - } else { - print $var; - } -} - -# Same syntax as getAttributeString in intltool-merge.in.in, similar logic (look for ## differences comment) -sub getAttributeString -{ - my $sub = shift; - my $do_translate = shift || 1; - my $language = shift || ""; - my $translate = shift; - my $result = ""; - foreach my $e (reverse(sort(keys %{ $sub }))) { - my $key = $e; - my $string = $sub->{$e}; - my $quote = '"'; - - $string =~ s/^[\s]+//; - $string =~ s/[\s]+$//; - - if ($string =~ /^'.*'$/) - { - $quote = "'"; - } - $string =~ s/^['"]//g; - $string =~ s/['"]$//g; - - ## differences from intltool-merge.in.in - if ($key =~ /^_/) { - $comments{entity_decode($string)} = $XMLCOMMENT if $XMLCOMMENT; - $messages{entity_decode($string)} = []; - $$translate = 2; - } - ## differences end here from intltool-merge.in.in - $result .= " $key=$quote$string$quote"; - } - return $result; -} - -# Verbatim copy from intltool-merge.in.in -sub getXMLstring -{ - my $ref = shift; - my $spacepreserve = shift || 0; - my @list = @{ $ref }; - my $result = ""; - - my $count = scalar(@list); - my $attrs = $list[0]; - my $index = 1; - - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - - while ($index < $count) { - my $type = $list[$index]; - my $content = $list[$index+1]; - if (! $type ) { - # We've got CDATA - if ($content) { - # lets strip the whitespace here, and *ONLY* here - $content =~ s/\s+/ /gs if (!$spacepreserve); - $result .= $content; - } - } elsif ( "$type" ne "1" ) { - # We've got another element - $result .= "<$type"; - $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements - if ($content) { - my $subresult = getXMLstring($content, $spacepreserve); - if ($subresult) { - $result .= ">".$subresult . ""; - } else { - $result .= "/>"; - } - } else { - $result .= "/>"; - } - } - $index += 2; - } - return $result; -} - -# Verbatim copy from intltool-merge.in.in, except for MULTIPLE_OUTPUT handling removed -# Translate list of nodes if necessary -sub translate_subnodes -{ - my $fh = shift; - my $content = shift; - my $language = shift || ""; - my $singlelang = shift || 0; - my $spacepreserve = shift || 0; - - my @nodes = @{ $content }; - - my $count = scalar(@nodes); - my $index = 0; - while ($index < $count) { - my $type = $nodes[$index]; - my $rest = $nodes[$index+1]; - traverse($fh, $type, $rest, $language, $spacepreserve); - $index += 2; - } -} - -# Based on traverse() in intltool-merge.in.in -sub traverse -{ - my $fh = shift; # unused, to allow us to sync code between -merge and -extract - my $nodename = shift; - my $content = shift; - my $language = shift || ""; - my $spacepreserve = shift || 0; - - if ($nodename && "$nodename" eq "1") { - $XMLCOMMENT = $content; - } elsif ($nodename) { - # element - my @all = @{ $content }; - my $attrs = shift @all; - my $translate = 0; - my $outattr = getAttributeString($attrs, 1, $language, \$translate); - - if ($nodename =~ /^_/) { - $translate = 1; - $nodename =~ s/^_//; - } - my $lookup = ''; - - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - if ($translate) { - $lookup = getXMLstring($content, $spacepreserve); - if (!$spacepreserve) { - $lookup =~ s/^\s+//s; - $lookup =~ s/\s+$//s; - } - - if ($lookup && $translate != 2) { - $comments{$lookup} = $XMLCOMMENT if $XMLCOMMENT; - $messages{$lookup} = []; - } elsif ($translate == 2) { - translate_subnodes($fh, \@all, $language, 1, $spacepreserve); - } - } else { - $XMLCOMMENT = ""; - my $count = scalar(@all); - if ($count > 0) { - my $index = 0; - while ($index < $count) { - my $type = $all[$index]; - my $rest = $all[$index+1]; - traverse($fh, $type, $rest, $language, $spacepreserve); - $index += 2; - } - } - } - $XMLCOMMENT = ""; - } -} - - -# Verbatim copy from intltool-merge.in.in, $fh for compatibility -sub parseTree -{ - my $fh = shift; - my $ref = shift; - my $language = shift || ""; - - my $name = shift @{ $ref }; - my $cont = shift @{ $ref }; - - while (!$name || "$name" eq "1") { - $name = shift @{ $ref }; - $cont = shift @{ $ref }; - } - - my $spacepreserve = 0; - my $attrs = @{$cont}[0]; - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - traverse($fh, $name, $cont, $language, $spacepreserve); -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_comment -{ - my $expat = shift; - my $data = $expat->original_string(); - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - $data =~ s/^$//s; - push @$clist, 1 => $data; -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_cdatastart -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - push @$clist, 0 => $expat->original_string(); -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_cdataend -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - $clist->[$pos] .= $expat->original_string(); -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_char -{ - my $expat = shift; - my $text = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - # Use original_string so that we retain escaped entities - # in CDATA sections. - # - if ($pos > 0 and $clist->[$pos - 1] eq '0') { - $clist->[$pos] .= $expat->original_string(); - } else { - push @$clist, 0 => $expat->original_string(); - } -} - -# Verbatim copy from intltool-merge.in.in -sub intltool_tree_start -{ - my $expat = shift; - my $tag = shift; - my @origlist = (); - - # Use original_string so that we retain escaped entities - # in attribute values. We must convert the string to an - # @origlist array to conform to the structure of the Tree - # Style. - # - my @original_array = split /\x/, $expat->original_string(); - my $source = $expat->original_string(); - - # Remove leading tag. - # - $source =~ s|^\s*<\s*(\S+)||s; - - # Grab attribute key/value pairs and push onto @origlist array. - # - while ($source) - { - if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s; - push @origlist, $1; - push @origlist, '"' . $2 . '"'; - } - elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s; - push @origlist, $1; - push @origlist, "'" . $2 . "'"; - } - else - { - last; - } - } - - my $ol = [ { @origlist } ]; - - push @{ $expat->{Lists} }, $expat->{Curlist}; - push @{ $expat->{Curlist} }, $tag => $ol; - $expat->{Curlist} = $ol; -} - -# Copied from intltool-merge.in.in and added comment handler. -sub readXml -{ - my $xmldoc = shift || return; - my $ret = eval 'require XML::Parser'; - if(!$ret) { - die "You must have XML::Parser installed to run $0\n\n"; - } - my $xp = new XML::Parser(Style => 'Tree'); - $xp->setHandlers(Char => \&intltool_tree_char); - $xp->setHandlers(Start => \&intltool_tree_start); - $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart); - $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend); - - ## differences from intltool-merge.in.in - $xp->setHandlers(Comment => \&intltool_tree_comment); - ## differences end here from intltool-merge.in.in - - my $tree = $xp->parse($xmldoc); - #print_var($tree); - -# Hello thereHowdydo -# would be: -# [foo, [{}, 1, "comment", head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar, -# [{}, 0, "Howdy", ref, [{}]], 0, "do" ] ] - - return $tree; -} - -sub type_schemas { - ### For schemas XML files ### - - # FIXME: We should handle escaped < (less than) - while ($input =~ / - \s* - (\s*(?:\s*)?(.*?)\s*<\/default>\s*)? - (\s*(?:\s*)?(.*?)\s*<\/short>\s*)? - (\s*(?:\s*)?(.*?)\s*<\/long>\s*)? - <\/locale> - /sgx) { - my @totranslate = ($3,$6,$9); - my @eachcomment = ($2,$5,$8); - foreach (@totranslate) { - my $currentcomment = shift @eachcomment; - next if !$_; - s/\s+/ /g; - $messages{entity_decode_minimal($_)} = []; - $comments{entity_decode_minimal($_)} = $currentcomment if (defined($currentcomment)); - } - } -} - -sub type_rfc822deb { - ### For rfc822-style Debian configuration files ### - - my $lineno = 1; - my $type = ''; - while ($input =~ /\G(.*?)(^|\n)(_+)([^:]+):[ \t]*(.*?)(?=\n\S|$)/sg) - { - my ($pre, $newline, $underscore, $tag, $text) = ($1, $2, $3, $4, $5); - while ($pre =~ m/\n/g) - { - $lineno ++; - } - $lineno += length($newline); - my @str_list = rfc822deb_split(length($underscore), $text); - for my $str (@str_list) - { - $strcount++; - $messages{$str} = []; - $loc{$str} = $lineno; - $count{$str} = $strcount; - my $usercomment = ''; - while($pre =~ s/(^|\n)#([^\n]*)$//s) - { - $usercomment = "\n" . $2 . $usercomment; - } - $comments{$str} = $tag . $usercomment; - } - $lineno += ($text =~ s/\n//g); - } -} - -sub rfc822deb_split { - # Debian defines a special way to deal with rfc822-style files: - # when a value contain newlines, it consists of - # 1. a short form (first line) - # 2. a long description, all lines begin with a space, - # and paragraphs are separated by a single dot on a line - # This routine returns an array of all paragraphs, and reformat - # them. - # When first argument is 2, the string is a comma separated list of - # values. - my $type = shift; - my $text = shift; - $text =~ s/^[ \t]//mg; - return (split(/, */, $text, 0)) if $type ne 1; - return ($text) if $text !~ /\n/; - - $text =~ s/([^\n]*)\n//; - my @list = ($1); - my $str = ''; - for my $line (split (/\n/, $text)) - { - chomp $line; - if ($line =~ /^\.\s*$/) - { - # New paragraph - $str =~ s/\s*$//; - push(@list, $str); - $str = ''; - } - elsif ($line =~ /^\s/) - { - # Line which must not be reformatted - $str .= "\n" if length ($str) && $str !~ /\n$/; - $line =~ s/\s+$//; - $str .= $line."\n"; - } - else - { - # Continuation line, remove newline - $str .= " " if length ($str) && $str !~ /\n$/; - $str .= $line; - } - } - $str =~ s/\s*$//; - push(@list, $str) if length ($str); - return @list; -} - -sub type_quoted { - while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { - my $message = $1; - my $before = $`; - $message =~ s/\\\"/\"/g; - $before =~ s/[^\n]//g; - $messages{$message} = []; - $loc{$message} = length ($before) + 2; - } -} - -sub type_quotedxml { - while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) { - my $message = $1; - my $before = $`; - $message =~ s/\\\"/\"/g; - $message = entity_decode($message); - $before =~ s/[^\n]//g; - $messages{$message} = []; - $loc{$message} = length ($before) + 2; - } -} - -sub type_glade { - ### For translatable Glade XML files ### - - my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message"; - - while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) { - # Glade sometimes uses tags that normally mark translatable things for - # little bits of non-translatable content. We work around this by not - # translating strings that only includes something like label4 or window1. - $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label|dialog)[0-9]+$/; - } - - while ($input =~ /(..[^<]*)<\/items>/sg) { - for my $item (split (/\n/, $1)) { - $messages{entity_decode($item)} = []; - } - } - - ## handle new glade files - while ($input =~ /<(property|atkproperty|col)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) { - $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/; - if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) { - $comments{entity_decode($3)} = entity_decode($2) ; - } - } - while ($input =~ /]*)"\s+description="([^>]+)"\/>/sg) { - $messages{entity_decode_minimal($2)} = []; - } -} - -sub type_scheme { - my ($line, $i, $state, $str, $trcomment, $char); - for $line (split(/\n/, $input)) { - $i = 0; - $state = 0; # 0 - nothing, 1 - string, 2 - translatable string - while ($i < length($line)) { - if (substr($line,$i,1) eq "\"") { - if ($state == 2) { - $comments{$str} = $trcomment if ($trcomment); - $messages{$str} = []; - $str = ''; - $state = 0; $trcomment = ""; - } elsif ($state == 1) { - $str = ''; - $state = 0; $trcomment = ""; - } else { - $state = 1; - $str = ''; - if ($i>0 && substr($line,$i-1,1) eq '_') { - $state = 2; - } - } - } elsif (!$state) { - if (substr($line,$i,1) eq ";") { - $trcomment = substr($line,$i+1); - $trcomment =~ s/^;*\s*//; - $i = length($line); - } elsif ($trcomment && substr($line,$i,1) !~ /\s|\(|\)|_/) { - $trcomment = ""; - } - } else { - if (substr($line,$i,1) eq "\\") { - $char = substr($line,$i+1,1); - if ($char ne "\"" && $char ne "\\") { - $str = $str . "\\"; - } - $i++; - } - $str = $str . substr($line,$i,1); - } - $i++; - } - } -} - -sub msg_write { - my @msgids; - if (%count) - { - @msgids = sort { $count{$a} <=> $count{$b} } keys %count; - } - else - { - @msgids = sort keys %messages; - } - for my $message (@msgids) - { - my $offsetlines = 1; - $offsetlines++ if $message =~ /%/; - if (defined ($comments{$message})) - { - while ($comments{$message} =~ m/\n/g) - { - $offsetlines++; - } - } - print OUT "# ".($loc{$message} - $offsetlines). " \"$FILE\"\n" - if defined $loc{$message}; - print OUT "/* ".$comments{$message}." */\n" - if defined $comments{$message}; - print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/; - - my @lines = split (/\n/, $message, -1); - for (my $n = 0; $n < @lines; $n++) - { - if ($n == 0) - { - print OUT "char *s = N_(\""; - } - else - { - print OUT " \""; - } - - print OUT escape($lines[$n]); - - if ($n < @lines - 1) - { - print OUT "\\n\"\n"; - } - else - { - print OUT "\");\n"; - } - } - } -} - diff -Nru vinagre-2.26.1/intltool-merge.in vinagre-2.29.1/intltool-merge.in --- vinagre-2.26.1/intltool-merge.in 2009-04-13 14:35:26.000000000 +0100 +++ vinagre-2.29.1/intltool-merge.in 2009-10-26 13:35:18.000000000 +0000 @@ -1,1506 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Merger -# -# Copyright (C) 2000, 2003 Free Software Foundation. -# Copyright (C) 2000, 2001 Eazel, Inc -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 published by the Free Software Foundation. -# -# Intltool 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Maciej Stachowiak -# Kenneth Christiansen -# Darin Adler -# -# Proper XML UTF-8'ification written by Cyrille Chepelov -# - -## Release information -my $PROGRAM = "intltool-merge"; -my $PACKAGE = "intltool"; -my $VERSION = "0.37.1"; - -## Loaded modules -use strict; -use Getopt::Long; -use Text::Wrap; -use File::Basename; - -my $must_end_tag = -1; -my $last_depth = -1; -my $translation_depth = -1; -my @tag_stack = (); -my @entered_tag = (); -my @translation_strings = (); -my $leading_space = ""; - -## Scalars used by the option stuff -my $HELP_ARG = 0; -my $VERSION_ARG = 0; -my $BA_STYLE_ARG = 0; -my $XML_STYLE_ARG = 0; -my $KEYS_STYLE_ARG = 0; -my $DESKTOP_STYLE_ARG = 0; -my $SCHEMAS_STYLE_ARG = 0; -my $RFC822DEB_STYLE_ARG = 0; -my $QUOTED_STYLE_ARG = 0; -my $QUOTEDXML_STYLE_ARG = 0; -my $QUIET_ARG = 0; -my $PASS_THROUGH_ARG = 0; -my $UTF8_ARG = 0; -my $MULTIPLE_OUTPUT = 0; -my $cache_file; - -## Handle options -GetOptions -( - "help" => \$HELP_ARG, - "version" => \$VERSION_ARG, - "quiet|q" => \$QUIET_ARG, - "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility - "ba-style|b" => \$BA_STYLE_ARG, - "xml-style|x" => \$XML_STYLE_ARG, - "keys-style|k" => \$KEYS_STYLE_ARG, - "desktop-style|d" => \$DESKTOP_STYLE_ARG, - "schemas-style|s" => \$SCHEMAS_STYLE_ARG, - "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG, - "quoted-style" => \$QUOTED_STYLE_ARG, - "quotedxml-style" => \$QUOTEDXML_STYLE_ARG, - "pass-through|p" => \$PASS_THROUGH_ARG, - "utf8|u" => \$UTF8_ARG, - "multiple-output|m" => \$MULTIPLE_OUTPUT, - "cache|c=s" => \$cache_file - ) or &error; - -my $PO_DIR; -my $FILE; -my $OUTFILE; - -my %po_files_by_lang = (); -my %translations = (); -my $iconv = $ENV{"ICONV"} || "iconv"; -my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); - -sub isProgramInPath -{ - my ($file) = @_; - # If either a file exists, or when run it returns 0 exit status - return 1 if ((-x $file) or (system("$file -l >$devnull") == 0)); - return 0; -} - -if (! isProgramInPath ("$iconv")) -{ - print STDERR " *** iconv is not found on this system!\n". - " *** Without it, intltool-merge can not convert encodings.\n"; - exit; -} - -# Use this instead of \w for XML files to handle more possible characters. -my $w = "[-A-Za-z0-9._:]"; - -# XML quoted string contents -my $q = "[^\\\"]*"; - -## Check for options. - -if ($VERSION_ARG) -{ - &print_version; -} -elsif ($HELP_ARG) -{ - &print_help; -} -elsif ($BA_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &ba_merge_translations; - &finalize; -} -elsif ($XML_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &xml_merge_output; - &finalize; -} -elsif ($KEYS_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &keys_merge_translations; - &finalize; -} -elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &desktop_merge_translations; - &finalize; -} -elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - &schemas_merge_translations; - &finalize; -} -elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2) -{ - &preparation; - &print_message; - &rfc822deb_merge_translations; - &finalize; -} -elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2) -{ - &utf8_sanity_check; - &preparation; - &print_message; - "ed_merge_translations($QUOTEDXML_STYLE_ARG); - &finalize; -} -else -{ - &print_help; -} - -exit; - -## Sub for printing release information -sub print_version -{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) ${VERSION} -Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen. - -Copyright (C) 2000-2003 Free Software Foundation, Inc. -Copyright (C) 2000-2001 Eazel, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -## Sub for printing usage information -sub print_help -{ - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE -Generates an output file that includes some localized attributes from an -untranslated source file. - -Mandatory options: (exactly one must be specified) - -b, --ba-style includes translations in the bonobo-activation style - -d, --desktop-style includes translations in the desktop style - -k, --keys-style includes translations in the keys style - -s, --schemas-style includes translations in the schemas style - -r, --rfc822deb-style includes translations in the RFC822 style - --quoted-style includes translations in the quoted string style - --quotedxml-style includes translations in the quoted xml string style - -x, --xml-style includes translations in the standard xml style - -Other options: - -u, --utf8 convert all strings to UTF-8 before merging - (default for everything except RFC822 style) - -p, --pass-through deprecated, does nothing and issues a warning - -m, --multiple-output output one localized file per locale, instead of - a single file containing all localized elements - -c, --cache=FILE specify cache file name - (usually \$top_builddir/po/.intltool-merge-cache) - -q, --quiet suppress most messages - --help display this help and exit - --version output version information and exit - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - - -## Sub for printing error messages -sub print_error -{ - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit; -} - - -sub print_message -{ - print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG; -} - - -sub preparation -{ - $PO_DIR = $ARGV[0]; - $FILE = $ARGV[1]; - $OUTFILE = $ARGV[2]; - - &gather_po_files; - &get_translation_database; -} - -# General-purpose code for looking up translations in .po files - -sub po_file2lang -{ - my ($tmp) = @_; - $tmp =~ s/^.*\/(.*)\.po$/$1/; - return $tmp; -} - -sub gather_po_files -{ - if (my $linguas = $ENV{"LINGUAS"}) - { - for my $lang (split / /, $linguas) { - my $po_file = $PO_DIR . "/" . $lang . ".po"; - if (-e $po_file) { - $po_files_by_lang{$lang} = $po_file; - } - } - } - else - { - if (open LINGUAS_FILE, "$PO_DIR/LINGUAS") - { - while () - { - next if /^#/; - - for my $lang (split) - { - chomp ($lang); - my $po_file = $PO_DIR . "/" . $lang . ".po"; - if (-e $po_file) { - $po_files_by_lang{$lang} = $po_file; - } - } - } - - close LINGUAS_FILE; - } - else - { - for my $po_file (glob "$PO_DIR/*.po") { - $po_files_by_lang{po_file2lang($po_file)} = $po_file; - } - } - } -} - -sub get_local_charset -{ - my ($encoding) = @_; - my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias"; - - # seek character encoding aliases in charset.alias (glib) - - if (open CHARSET_ALIAS, $alias_file) - { - while () - { - next if /^\#/; - return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i) - } - - close CHARSET_ALIAS; - } - - # if not found, return input string - - return $encoding; -} - -sub get_po_encoding -{ - my ($in_po_file) = @_; - my $encoding = ""; - - open IN_PO_FILE, $in_po_file or die; - while () - { - ## example: "Content-Type: text/plain; charset=ISO-8859-1\n" - if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/) - { - $encoding = $1; - last; - } - } - close IN_PO_FILE; - - if (!$encoding) - { - print STDERR "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n" unless $QUIET_ARG; - $encoding = "ISO-8859-1"; - } - - system ("$iconv -f $encoding -t UTF-8 <$devnull 2>$devnull"); - if ($?) { - $encoding = get_local_charset($encoding); - } - - return $encoding -} - -sub utf8_sanity_check -{ - print STDERR "Warning: option --pass-through has been removed.\n" if $PASS_THROUGH_ARG; - $UTF8_ARG = 1; -} - -sub get_translation_database -{ - if ($cache_file) { - &get_cached_translation_database; - } else { - &create_translation_database; - } -} - -sub get_newest_po_age -{ - my $newest_age; - - foreach my $file (values %po_files_by_lang) - { - my $file_age = -M $file; - $newest_age = $file_age if !$newest_age || $file_age < $newest_age; - } - - $newest_age = 0 if !$newest_age; - - return $newest_age; -} - -sub create_cache -{ - print "Generating and caching the translation database\n" unless $QUIET_ARG; - - &create_translation_database; - - open CACHE, ">$cache_file" || die; - print CACHE join "\x01", %translations; - close CACHE; -} - -sub load_cache -{ - print "Found cached translation database\n" unless $QUIET_ARG; - - my $contents; - open CACHE, "<$cache_file" || die; - { - local $/; - $contents = ; - } - close CACHE; - %translations = split "\x01", $contents; -} - -sub get_cached_translation_database -{ - my $cache_file_age = -M $cache_file; - if (defined $cache_file_age) - { - if ($cache_file_age <= &get_newest_po_age) - { - &load_cache; - return; - } - print "Found too-old cached translation database\n" unless $QUIET_ARG; - } - - &create_cache; -} - -sub create_translation_database -{ - for my $lang (keys %po_files_by_lang) - { - my $po_file = $po_files_by_lang{$lang}; - - if ($UTF8_ARG) - { - my $encoding = get_po_encoding ($po_file); - - if (lc $encoding eq "utf-8") - { - open PO_FILE, "<$po_file"; - } - else - { - print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;; - - open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; - } - } - else - { - open PO_FILE, "<$po_file"; - } - - my $nextfuzzy = 0; - my $inmsgid = 0; - my $inmsgstr = 0; - my $msgid = ""; - my $msgstr = ""; - - while () - { - $nextfuzzy = 1 if /^#, fuzzy/; - - if (/^msgid "((\\.|[^\\]+)*)"/ ) - { - $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; - $msgid = ""; - $msgstr = ""; - - if ($nextfuzzy) { - $inmsgid = 0; - } else { - $msgid = unescape_po_string($1); - $inmsgid = 1; - } - $inmsgstr = 0; - $nextfuzzy = 0; - } - - if (/^msgstr "((\\.|[^\\]+)*)"/) - { - $msgstr = unescape_po_string($1); - $inmsgstr = 1; - $inmsgid = 0; - } - - if (/^"((\\.|[^\\]+)*)"/) - { - $msgid .= unescape_po_string($1) if $inmsgid; - $msgstr .= unescape_po_string($1) if $inmsgstr; - } - } - $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; - } -} - -sub finalize -{ -} - -sub unescape_one_sequence -{ - my ($sequence) = @_; - - return "\\" if $sequence eq "\\\\"; - return "\"" if $sequence eq "\\\""; - return "\n" if $sequence eq "\\n"; - return "\r" if $sequence eq "\\r"; - return "\t" if $sequence eq "\\t"; - return "\b" if $sequence eq "\\b"; - return "\f" if $sequence eq "\\f"; - return "\a" if $sequence eq "\\a"; - return chr(11) if $sequence eq "\\v"; # vertical tab, see ascii(7) - - return chr(hex($1)) if ($sequence =~ /\\x([0-9a-fA-F]{2})/); - return chr(oct($1)) if ($sequence =~ /\\([0-7]{3})/); - - # FIXME: Is \0 supported as well? Kenneth and Rodney don't want it, see bug #48489 - - return $sequence; -} - -sub unescape_po_string -{ - my ($string) = @_; - - $string =~ s/(\\x[0-9a-fA-F]{2}|\\[0-7]{3}|\\.)/unescape_one_sequence($1)/eg; - - return $string; -} - -sub entity_decode -{ - local ($_) = @_; - - s/'/'/g; # ' - s/"/"/g; # " - s/<//g; - s/&/&/g; - - return $_; -} - -# entity_encode: (string) -# -# Encode the given string to XML format (encode '<' etc). - -sub entity_encode -{ - my ($pre_encoded) = @_; - - my @list_of_chars = unpack ('C*', $pre_encoded); - - # with UTF-8 we only encode minimalistic - return join ('', map (&entity_encode_int_minimalist, @list_of_chars)); -} - -sub entity_encode_int_minimalist -{ - return """ if $_ == 34; - return "&" if $_ == 38; - return "'" if $_ == 39; - return "<" if $_ == 60; - return ">" if $_ == 62; - return chr $_; -} - -sub entity_encoded_translation -{ - my ($lang, $string) = @_; - - my $translation = $translations{$lang, $string}; - return $string if !$translation; - return entity_encode ($translation); -} - -## XML (bonobo-activation specific) merge code - -sub ba_merge_translations -{ - my $source; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!"; - # Binmode so that selftest works ok if using a native Win32 Perl... - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s) - { - print OUTPUT $1; - - my $node = $2 . "\n"; - - my @strings = (); - $_ = $node; - while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) { - push @strings, entity_decode($3); - } - print OUTPUT; - - my %langs; - for my $string (@strings) - { - for my $lang (keys %po_files_by_lang) - { - $langs{$lang} = 1 if $translations{$lang, $string}; - } - } - - for my $lang (sort keys %langs) - { - $_ = $node; - s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s; - s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg; - print OUTPUT; - } - } - - print OUTPUT $source; - - close OUTPUT; -} - - -## XML (non-bonobo-activation) merge code - - -# Process tag attributes -# Only parameter is a HASH containing attributes -> values mapping -sub getAttributeString -{ - my $sub = shift; - my $do_translate = shift || 0; - my $language = shift || ""; - my $result = ""; - my $translate = shift; - foreach my $e (reverse(sort(keys %{ $sub }))) { - my $key = $e; - my $string = $sub->{$e}; - my $quote = '"'; - - $string =~ s/^[\s]+//; - $string =~ s/[\s]+$//; - - if ($string =~ /^'.*'$/) - { - $quote = "'"; - } - $string =~ s/^['"]//g; - $string =~ s/['"]$//g; - - if ($do_translate && $key =~ /^_/) { - $key =~ s|^_||g; - if ($language) { - # Handle translation - my $decode_string = entity_decode($string); - my $translation = $translations{$language, $decode_string}; - if ($translation) { - $translation = entity_encode($translation); - $string = $translation; - } - $$translate = 2; - } else { - $$translate = 2 if ($translate && (!$$translate)); # watch not to "overwrite" $translate - } - } - - $result .= " $key=$quote$string$quote"; - } - return $result; -} - -# Returns a translatable string from XML node, it works on contents of every node in XML::Parser tree -sub getXMLstring -{ - my $ref = shift; - my $spacepreserve = shift || 0; - my @list = @{ $ref }; - my $result = ""; - - my $count = scalar(@list); - my $attrs = $list[0]; - my $index = 1; - - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - - while ($index < $count) { - my $type = $list[$index]; - my $content = $list[$index+1]; - if (! $type ) { - # We've got CDATA - if ($content) { - # lets strip the whitespace here, and *ONLY* here - $content =~ s/\s+/ /gs if (!$spacepreserve); - $result .= $content; - } - } elsif ( "$type" ne "1" ) { - # We've got another element - $result .= "<$type"; - $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements - if ($content) { - my $subresult = getXMLstring($content, $spacepreserve); - if ($subresult) { - $result .= ">".$subresult . ""; - } else { - $result .= "/>"; - } - } else { - $result .= "/>"; - } - } - $index += 2; - } - return $result; -} - -# Translate list of nodes if necessary -sub translate_subnodes -{ - my $fh = shift; - my $content = shift; - my $language = shift || ""; - my $singlelang = shift || 0; - my $spacepreserve = shift || 0; - - my @nodes = @{ $content }; - - my $count = scalar(@nodes); - my $index = 0; - while ($index < $count) { - my $type = $nodes[$index]; - my $rest = $nodes[$index+1]; - if ($singlelang) { - my $oldMO = $MULTIPLE_OUTPUT; - $MULTIPLE_OUTPUT = 1; - traverse($fh, $type, $rest, $language, $spacepreserve); - $MULTIPLE_OUTPUT = $oldMO; - } else { - traverse($fh, $type, $rest, $language, $spacepreserve); - } - $index += 2; - } -} - -sub isWellFormedXmlFragment -{ - my $ret = eval 'require XML::Parser'; - if(!$ret) { - die "You must have XML::Parser installed to run $0\n\n"; - } - - my $fragment = shift; - return 0 if (!$fragment); - - $fragment = "$fragment"; - my $xp = new XML::Parser(Style => 'Tree'); - my $tree = 0; - eval { $tree = $xp->parse($fragment); }; - return $tree; -} - -sub traverse -{ - my $fh = shift; - my $nodename = shift; - my $content = shift; - my $language = shift || ""; - my $spacepreserve = shift || 0; - - if (!$nodename) { - if ($content =~ /^[\s]*$/) { - $leading_space .= $content; - } - print $fh $content; - } else { - # element - my @all = @{ $content }; - my $attrs = shift @all; - my $translate = 0; - my $outattr = getAttributeString($attrs, 1, $language, \$translate); - - if ($nodename =~ /^_/) { - $translate = 1; - $nodename =~ s/^_//; - } - my $lookup = ''; - - $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?default["']?$/)); - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - print $fh "<$nodename", $outattr; - if ($translate) { - $lookup = getXMLstring($content, $spacepreserve); - if (!$spacepreserve) { - $lookup =~ s/^\s+//s; - $lookup =~ s/\s+$//s; - } - - if ($lookup || $translate == 2) { - my $translation = $translations{$language, $lookup} if isWellFormedXmlFragment($translations{$language, $lookup}); - if ($MULTIPLE_OUTPUT && ($translation || $translate == 2)) { - $translation = $lookup if (!$translation); - print $fh " xml:lang=\"", $language, "\"" if $language; - print $fh ">"; - if ($translate == 2) { - translate_subnodes($fh, \@all, $language, 1, $spacepreserve); - } else { - print $fh $translation; - } - print $fh ""; - - return; # this means there will be no same translation with xml:lang="$language"... - # if we want them both, just remove this "return" - } else { - print $fh ">"; - if ($translate == 2) { - translate_subnodes($fh, \@all, $language, 1, $spacepreserve); - } else { - print $fh $lookup; - } - print $fh ""; - } - } else { - print $fh "/>"; - } - - for my $lang (sort keys %po_files_by_lang) { - if ($MULTIPLE_OUTPUT && $lang ne "$language") { - next; - } - if ($lang) { - # Handle translation - # - my $translate = 0; - my $localattrs = getAttributeString($attrs, 1, $lang, \$translate); - my $translation = $translations{$lang, $lookup} if isWellFormedXmlFragment($translations{$lang, $lookup}); - if ($translate && !$translation) { - $translation = $lookup; - } - - if ($translation || $translate) { - print $fh "\n"; - $leading_space =~ s/.*\n//g; - print $fh $leading_space; - print $fh "<", $nodename, " xml:lang=\"", $lang, "\"", $localattrs, ">"; - if ($translate == 2) { - translate_subnodes($fh, \@all, $lang, 1, $spacepreserve); - } else { - print $fh $translation; - } - print $fh ""; - } - } - } - - } else { - my $count = scalar(@all); - if ($count > 0) { - print $fh ">"; - my $index = 0; - while ($index < $count) { - my $type = $all[$index]; - my $rest = $all[$index+1]; - traverse($fh, $type, $rest, $language, $spacepreserve); - $index += 2; - } - print $fh ""; - } else { - print $fh "/>"; - } - } - } -} - -sub intltool_tree_comment -{ - my $expat = shift; - my $data = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - push @$clist, 1 => $data; -} - -sub intltool_tree_cdatastart -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - push @$clist, 0 => $expat->original_string(); -} - -sub intltool_tree_cdataend -{ - my $expat = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - $clist->[$pos] .= $expat->original_string(); -} - -sub intltool_tree_char -{ - my $expat = shift; - my $text = shift; - my $clist = $expat->{Curlist}; - my $pos = $#$clist; - - # Use original_string so that we retain escaped entities - # in CDATA sections. - # - if ($pos > 0 and $clist->[$pos - 1] eq '0') { - $clist->[$pos] .= $expat->original_string(); - } else { - push @$clist, 0 => $expat->original_string(); - } -} - -sub intltool_tree_start -{ - my $expat = shift; - my $tag = shift; - my @origlist = (); - - # Use original_string so that we retain escaped entities - # in attribute values. We must convert the string to an - # @origlist array to conform to the structure of the Tree - # Style. - # - my @original_array = split /\x/, $expat->original_string(); - my $source = $expat->original_string(); - - # Remove leading tag. - # - $source =~ s|^\s*<\s*(\S+)||s; - - # Grab attribute key/value pairs and push onto @origlist array. - # - while ($source) - { - if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s; - push @origlist, $1; - push @origlist, '"' . $2 . '"'; - } - elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/) - { - $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s; - push @origlist, $1; - push @origlist, "'" . $2 . "'"; - } - else - { - last; - } - } - - my $ol = [ { @origlist } ]; - - push @{ $expat->{Lists} }, $expat->{Curlist}; - push @{ $expat->{Curlist} }, $tag => $ol; - $expat->{Curlist} = $ol; -} - -sub readXml -{ - my $filename = shift || return; - if(!-f $filename) { - die "ERROR Cannot find filename: $filename\n"; - } - - my $ret = eval 'require XML::Parser'; - if(!$ret) { - die "You must have XML::Parser installed to run $0\n\n"; - } - my $xp = new XML::Parser(Style => 'Tree'); - $xp->setHandlers(Char => \&intltool_tree_char); - $xp->setHandlers(Start => \&intltool_tree_start); - $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart); - $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend); - my $tree = $xp->parsefile($filename); - -# Hello thereHowdydo -# would be: -# [foo, [{}, head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar, [{}, -# 0, "Howdy", ref, [{}]], 0, "do" ] ] - - return $tree; -} - -sub print_header -{ - my $infile = shift; - my $fh = shift; - my $source; - - if(!-f $infile) { - die "ERROR Cannot find filename: $infile\n"; - } - - print $fh qq{\n}; - { - local $/; - open DOCINPUT, "<${FILE}" or die; - $source = ; - close DOCINPUT; - } - if ($source =~ /()/s) - { - print $fh "$1\n"; - } - elsif ($source =~ /(]*>)/s) - { - print $fh "$1\n"; - } -} - -sub parseTree -{ - my $fh = shift; - my $ref = shift; - my $language = shift || ""; - - my $name = shift @{ $ref }; - my $cont = shift @{ $ref }; - - while (!$name || "$name" eq "1") { - $name = shift @{ $ref }; - $cont = shift @{ $ref }; - } - - my $spacepreserve = 0; - my $attrs = @{$cont}[0]; - $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)); - - traverse($fh, $name, $cont, $language, $spacepreserve); -} - -sub xml_merge_output -{ - my $source; - - if ($MULTIPLE_OUTPUT) { - for my $lang (sort keys %po_files_by_lang) { - if ( ! -d $lang ) { - mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; - } - open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree, $lang); - close OUTPUT; - print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; - } - if ( ! -d "C" ) { - mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n"; - } - open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree); - close OUTPUT; - print "CREATED C/$OUTFILE\n" unless $QUIET_ARG; - } else { - open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - my $tree = readXml($FILE); - print_header($FILE, \*OUTPUT); - parseTree(\*OUTPUT, $tree); - close OUTPUT; - print "CREATED $OUTFILE\n" unless $QUIET_ARG; - } -} - -sub keys_merge_translation -{ - my ($lang) = @_; - - if ( ! -d $lang && $MULTIPLE_OUTPUT) - { - mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; - } - - open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n"; - open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while () - { - if (s/^(\s*)_(\w+=(.*))/$1$2/) - { - my $string = $3; - - if (!$MULTIPLE_OUTPUT) - { - print OUTPUT; - - my $non_translated_line = $_; - - for my $lang (sort keys %po_files_by_lang) - { - my $translation = $translations{$lang, $string}; - next if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/[$lang]$1=$translation/; - print OUTPUT; - } - } - else - { - my $non_translated_line = $_; - my $translation = $translations{$lang, $string}; - $translation = $string if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/$1=$translation/; - print OUTPUT; - } - } - else - { - print OUTPUT; - } - } - - close OUTPUT; - close INPUT; - - print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG; -} - -sub keys_merge_translations -{ - if ($MULTIPLE_OUTPUT) - { - for my $lang (sort keys %po_files_by_lang) - { - keys_merge_translation ($lang); - } - keys_merge_translation ("C"); - } - else - { - keys_merge_translation ("."); - } -} - -sub desktop_merge_translations -{ - open INPUT, "<${FILE}" or die; - open OUTPUT, ">${OUTFILE}" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while () - { - if (s/^(\s*)_(\w+=(.*))/$1$2/) - { - my $string = $3; - - print OUTPUT; - - my $non_translated_line = $_; - - for my $lang (sort keys %po_files_by_lang) - { - my $translation = $translations{$lang, $string}; - next if !$translation; - - $_ = $non_translated_line; - s/(\w+)=.*/${1}[$lang]=$translation/; - print OUTPUT; - } - } - else - { - print OUTPUT; - } - } - - close OUTPUT; - close INPUT; -} - -sub schemas_merge_translations -{ - my $source; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">$OUTFILE" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - # FIXME: support attribute translations - - # Empty nodes never need translation, so unmark all of them. - # For example, <_foo/> is just replaced by . - $source =~ s|<\s*_($w+)\s*/>|<$1/>|g; - - while ($source =~ s/ - (.*?) - (\s+)((\s*) - (\s*(?:\s*)?(.*?)\s*<\/default>)?(\s*) - (\s*(?:\s*)?(.*?)\s*<\/short>)?(\s*) - (\s*(?:\s*)?(.*?)\s*<\/long>)?(\s*) - <\/locale>) - //sx) - { - print OUTPUT $1; - - my $locale_start_spaces = $2 ? $2 : ''; - my $default_spaces = $4 ? $4 : ''; - my $short_spaces = $7 ? $7 : ''; - my $long_spaces = $10 ? $10 : ''; - my $locale_end_spaces = $13 ? $13 : ''; - my $c_default_block = $3 ? $3 : ''; - my $default_string = $6 ? $6 : ''; - my $short_string = $9 ? $9 : ''; - my $long_string = $12 ? $12 : ''; - - print OUTPUT "$locale_start_spaces$c_default_block"; - - $default_string =~ s/\s+/ /g; - $default_string = entity_decode($default_string); - $short_string =~ s/\s+/ /g; - $short_string = entity_decode($short_string); - $long_string =~ s/\s+/ /g; - $long_string = entity_decode($long_string); - - for my $lang (sort keys %po_files_by_lang) - { - my $default_translation = $translations{$lang, $default_string}; - my $short_translation = $translations{$lang, $short_string}; - my $long_translation = $translations{$lang, $long_string}; - - next if (!$default_translation && !$short_translation && - !$long_translation); - - print OUTPUT "\n$locale_start_spaces"; - - print OUTPUT "$default_spaces"; - - if ($default_translation) - { - $default_translation = entity_encode($default_translation); - print OUTPUT "$default_translation"; - } - - print OUTPUT "$short_spaces"; - - if ($short_translation) - { - $short_translation = entity_encode($short_translation); - print OUTPUT "$short_translation"; - } - - print OUTPUT "$long_spaces"; - - if ($long_translation) - { - $long_translation = entity_encode($long_translation); - print OUTPUT "$long_translation"; - } - - print OUTPUT "$locale_end_spaces"; - } - } - - print OUTPUT $source; - - close OUTPUT; -} - -sub rfc822deb_merge_translations -{ - my %encodings = (); - for my $lang (keys %po_files_by_lang) { - $encodings{$lang} = ($UTF8_ARG ? 'UTF-8' : get_po_encoding($po_files_by_lang{$lang})); - } - - my $source; - - $Text::Wrap::huge = 'overflow'; - $Text::Wrap::break = qr/\n|\s(?=\S)/; - - { - local $/; # slurp mode - open INPUT, "<$FILE" or die "can't open $FILE: $!"; - $source = ; - close INPUT; - } - - open OUTPUT, ">${OUTFILE}" or die; - binmode (OUTPUT) if $^O eq 'MSWin32'; - - while ($source =~ /(^|\n+)(_*)([^:\s]+)(:[ \t]*)(.*?)(?=\n[\S\n]|$)/sg) - { - my $sep = $1; - my $non_translated_line = $3.$4; - my $string = $5; - my $underscore = length($2); - next if $underscore eq 0 && $non_translated_line =~ /^#/; - # Remove [] dummy strings - my $stripped = $string; - $stripped =~ s/\[\s[^\[\]]*\],/,/g if $underscore eq 2; - $stripped =~ s/\[\s[^\[\]]*\]$//; - $non_translated_line .= $stripped; - - print OUTPUT $sep.$non_translated_line; - - if ($underscore) - { - my @str_list = rfc822deb_split($underscore, $string); - - for my $lang (sort keys %po_files_by_lang) - { - my $is_translated = 1; - my $str_translated = ''; - my $first = 1; - - for my $str (@str_list) - { - my $translation = $translations{$lang, $str}; - - if (!$translation) - { - $is_translated = 0; - last; - } - - # $translation may also contain [] dummy - # strings, mostly to indicate an empty string - $translation =~ s/\[\s[^\[\]]*\]$//; - - if ($first) - { - if ($underscore eq 2) - { - $str_translated .= $translation; - } - else - { - $str_translated .= - Text::Tabs::expand($translation) . - "\n"; - } - } - else - { - if ($underscore eq 2) - { - $str_translated .= ', ' . $translation; - } - else - { - $str_translated .= Text::Tabs::expand( - Text::Wrap::wrap(' ', ' ', $translation)) . - "\n .\n"; - } - } - $first = 0; - - # To fix some problems with Text::Wrap::wrap - $str_translated =~ s/(\n )+\n/\n .\n/g; - } - next unless $is_translated; - - $str_translated =~ s/\n \.\n$//; - $str_translated =~ s/\s+$//; - - $_ = $non_translated_line; - s/^(\w+):\s*.*/$sep${1}-$lang.$encodings{$lang}: $str_translated/s; - print OUTPUT; - } - } - } - print OUTPUT "\n"; - - close OUTPUT; - close INPUT; -} - -sub rfc822deb_split -{ - # Debian defines a special way to deal with rfc822-style files: - # when a value contain newlines, it consists of - # 1. a short form (first line) - # 2. a long description, all lines begin with a space, - # and paragraphs are separated by a single dot on a line - # This routine returns an array of all paragraphs, and reformat - # them. - # When first argument is 2, the string is a comma separated list of - # values. - my $type = shift; - my $text = shift; - $text =~ s/^[ \t]//mg; - return (split(/, */, $text, 0)) if $type ne 1; - return ($text) if $text !~ /\n/; - - $text =~ s/([^\n]*)\n//; - my @list = ($1); - my $str = ''; - - for my $line (split (/\n/, $text)) - { - chomp $line; - if ($line =~ /^\.\s*$/) - { - # New paragraph - $str =~ s/\s*$//; - push(@list, $str); - $str = ''; - } - elsif ($line =~ /^\s/) - { - # Line which must not be reformatted - $str .= "\n" if length ($str) && $str !~ /\n$/; - $line =~ s/\s+$//; - $str .= $line."\n"; - } - else - { - # Continuation line, remove newline - $str .= " " if length ($str) && $str !~ /\n$/; - $str .= $line; - } - } - - $str =~ s/\s*$//; - push(@list, $str) if length ($str); - - return @list; -} - -sub quoted_translation -{ - my ($xml_mode, $lang, $string) = @_; - - $string = entity_decode($string) if $xml_mode; - $string =~ s/\\\"/\"/g; - - my $translation = $translations{$lang, $string}; - $translation = $string if !$translation; - $translation = entity_encode($translation) if $xml_mode; - $translation =~ s/\"/\\\"/g; - return $translation -} - -sub quoted_merge_translations -{ - my ($xml_mode) = @_; - - if (!$MULTIPLE_OUTPUT) { - print "Quoted only supports Multiple Output.\n"; - exit(1); - } - - for my $lang (sort keys %po_files_by_lang) { - if ( ! -d $lang ) { - mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n"; - } - open INPUT, "<${FILE}" or die; - open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n"; - binmode (OUTPUT) if $^O eq 'MSWin32'; - while () - { - s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge; - print OUTPUT; - } - close OUTPUT; - close INPUT; - } -} diff -Nru vinagre-2.26.1/intltool-update.in vinagre-2.29.1/intltool-update.in --- vinagre-2.26.1/intltool-update.in 2009-04-13 14:35:26.000000000 +0100 +++ vinagre-2.29.1/intltool-update.in 2009-10-26 13:35:18.000000000 +0000 @@ -1,1166 +0,0 @@ -#!@INTLTOOL_PERL@ -w -# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - -# -# The Intltool Message Updater -# -# Copyright (C) 2000-2003 Free Software Foundation. -# -# Intltool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# version 2 published by the Free Software Foundation. -# -# Intltool 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# Authors: Kenneth Christiansen -# Maciej Stachowiak -# Darin Adler - -## Release information -my $PROGRAM = "intltool-update"; -my $VERSION = "0.37.1"; -my $PACKAGE = "intltool"; - -## Loaded modules -use strict; -use Getopt::Long; -use Cwd; -use File::Copy; -use File::Find; - -## Scalars used by the option stuff -my $HELP_ARG = 0; -my $VERSION_ARG = 0; -my $DIST_ARG = 0; -my $POT_ARG = 0; -my $HEADERS_ARG = 0; -my $MAINTAIN_ARG = 0; -my $REPORT_ARG = 0; -my $VERBOSE = 0; -my $GETTEXT_PACKAGE = ""; -my $OUTPUT_FILE = ""; - -my @languages; -my %varhash = (); -my %po_files_by_lang = (); - -# Regular expressions to categorize file types. -# FIXME: Please check if the following is correct - -my $xml_support = -"xml(?:\\.in)*|". # http://www.w3.org/XML/ (Note: .in is not required) -"ui|". # Bonobo specific - User Interface desc. files -"lang|". # ? -"glade2?(?:\\.in)*|". # Glade specific - User Interface desc. files (Note: .in is not required) -"scm(?:\\.in)*|". # ? (Note: .in is not required) -"oaf(?:\\.in)+|". # DEPRECATED: Replaces by Bonobo .server files -"etspec|". # ? -"server(?:\\.in)+|". # Bonobo specific -"sheet(?:\\.in)+|". # ? -"schemas(?:\\.in)+|". # GConf specific -"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. -"kbd(?:\\.in)+|". # GOK specific. -"policy(?:\\.in)+"; # PolicyKit files - -my $ini_support = -"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec -"desktop(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec -"caves(?:\\.in)+|". # GNOME Games specific -"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec -"soundlist(?:\\.in)+|". # GNOME specific -"keys(?:\\.in)+|". # GNOME Mime database specific -"theme(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec -"service(?:\\.in)+"; # DBus specific - -my $buildin_gettext_support = -"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py"; - -## Always flush buffer when printing -$| = 1; - -## Sometimes the source tree will be rooted somewhere else. -my $SRCDIR = $ENV{"srcdir"} || "."; -my $POTFILES_in; - -$POTFILES_in = "<$SRCDIR/POTFILES.in"; - -my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null'); - -## Handle options -GetOptions -( - "help" => \$HELP_ARG, - "version" => \$VERSION_ARG, - "dist|d" => \$DIST_ARG, - "pot|p" => \$POT_ARG, - "headers|s" => \$HEADERS_ARG, - "maintain|m" => \$MAINTAIN_ARG, - "report|r" => \$REPORT_ARG, - "verbose|x" => \$VERBOSE, - "gettext-package|g=s" => \$GETTEXT_PACKAGE, - "output-file|o=s" => \$OUTPUT_FILE, - ) or &Console_WriteError_InvalidOption; - -&Console_Write_IntltoolHelp if $HELP_ARG; -&Console_Write_IntltoolVersion if $VERSION_ARG; - -my $arg_count = ($DIST_ARG > 0) - + ($POT_ARG > 0) - + ($HEADERS_ARG > 0) - + ($MAINTAIN_ARG > 0) - + ($REPORT_ARG > 0); - -&Console_Write_IntltoolHelp if $arg_count > 1; - -my $PKGNAME = FindPackageName (); - -# --version and --help don't require a module name -my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown"; - -if ($POT_ARG) -{ - &GenerateHeaders; - &GeneratePOTemplate; -} -elsif ($HEADERS_ARG) -{ - &GenerateHeaders; -} -elsif ($MAINTAIN_ARG) -{ - &FindLeftoutFiles; -} -elsif ($REPORT_ARG) -{ - &GenerateHeaders; - &GeneratePOTemplate; - &Console_Write_CoverageReport; -} -elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/) -{ - my $lang = $ARGV[0]; - - ## Report error if the language file supplied - ## to the command line is non-existent - &Console_WriteError_NotExisting("$SRCDIR/$lang.po") - if ! -s "$SRCDIR/$lang.po"; - - if (!$DIST_ARG) - { - print "Working, please wait..." if $VERBOSE; - &GenerateHeaders; - &GeneratePOTemplate; - } - &POFile_Update ($lang, $OUTPUT_FILE); - &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE); -} -else -{ - &Console_Write_IntltoolHelp; -} - -exit; - -######### - -sub Console_Write_IntltoolVersion -{ - print <<_EOF_; -${PROGRAM} (${PACKAGE}) $VERSION -Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler. - -Copyright (C) 2000-2003 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -_EOF_ - exit; -} - -sub Console_Write_IntltoolHelp -{ - print <<_EOF_; -Usage: ${PROGRAM} [OPTION]... LANGCODE -Updates PO template files and merge them with the translations. - -Mode of operation (only one is allowed): - -p, --pot generate the PO template only - -s, --headers generate the header files in POTFILES.in - -m, --maintain search for left out files from POTFILES.in - -r, --report display a status report for the module - -d, --dist merge LANGCODE.po with existing PO template - -Extra options: - -g, --gettext-package=NAME override PO template name, useful with --pot - -o, --output-file=FILE write merged translation to FILE - -x, --verbose display lots of feedback - --help display this help and exit - --version output version information and exit - -Examples of use: -${PROGRAM} --pot just create a new PO template -${PROGRAM} xy create new PO template and merge xy.po with it - -Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE") -or send email to . -_EOF_ - exit; -} - -sub echo_n -{ - my $str = shift; - my $ret = `echo "$str"`; - - $ret =~ s/\n$//; # do we need the "s" flag? - - return $ret; -} - -sub POFile_DetermineType ($) -{ - my $type = $_; - my $gettext_type; - - my $xml_regex = "(?:" . $xml_support . ")"; - my $ini_regex = "(?:" . $ini_support . ")"; - my $buildin_regex = "(?:" . $buildin_gettext_support . ")"; - - if ($type =~ /\[type: gettext\/([^\]].*)]/) - { - $gettext_type=$1; - } - elsif ($type =~ /schemas(\.in)+$/) - { - $gettext_type="schemas"; - } - elsif ($type =~ /glade2?(\.in)*$/) - { - $gettext_type="glade"; - } - elsif ($type =~ /scm(\.in)*$/) - { - $gettext_type="scheme"; - } - elsif ($type =~ /keys(\.in)+$/) - { - $gettext_type="keys"; - } - - # bucket types - - elsif ($type =~ /$xml_regex$/) - { - $gettext_type="xml"; - } - elsif ($type =~ /$ini_regex$/) - { - $gettext_type="ini"; - } - elsif ($type =~ /$buildin_regex$/) - { - $gettext_type="buildin"; - } - else - { - $gettext_type="unknown"; - } - - return "gettext\/$gettext_type"; -} - -sub TextFile_DetermineEncoding ($) -{ - my $gettext_code="ASCII"; # All files are ASCII by default - my $filetype=`file $_ | cut -d ' ' -f 2`; - - if ($? eq "0") - { - if ($filetype =~ /^(ISO|UTF)/) - { - chomp ($gettext_code = $filetype); - } - elsif ($filetype =~ /^XML/) - { - $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8 - } - } - - return $gettext_code; -} - -sub isNotValidMissing -{ - my ($file) = @_; - - return if $file =~ /^\{arch\}\/.*$/; - return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/; -} - -sub FindLeftoutFiles -{ - my (@buf_i18n_plain, - @buf_i18n_xml, - @buf_i18n_xml_unmarked, - @buf_i18n_ini, - @buf_potfiles, - @buf_potfiles_ignore, - @buf_allfiles, - @buf_allfiles_sorted, - @buf_potfiles_sorted, - @buf_potfiles_ignore_sorted - ); - - ## Search and find all translatable files - find sub { - push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; - push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; - push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; - push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; - }, ".."; - find sub { - push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/; - push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/; - push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/; - push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/; - }, "$SRCDIR/.." if "$SRCDIR" ne "."; - - open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n"; - @buf_potfiles = grep !/^(#|\s*$)/, ; - close POTFILES; - - foreach (@buf_potfiles) { - s/^\[.*]\s*//; - } - - print "Searching for missing translatable files...\n" if $VERBOSE; - - ## Check if we should ignore some found files, when - ## comparing with POTFILES.in - foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") - { - (-s "$SRCDIR/$ignore") or next; - - if ("$ignore" eq "POTFILES.ignore") - { - print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n". - "content of this file to POTFILES.skip.\n"; - } - - print "Found $ignore: Ignoring files...\n" if $VERBOSE; - open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n"; - - while () - { - push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/; - } - close FILE; - - @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore); - } - - foreach my $file (@buf_i18n_plain) - { - my $in_comment = 0; - my $in_macro = 0; - - open FILE, "<$file"; - while () - { - # Handle continued multi-line comment. - if ($in_comment) - { - next unless s-.*\*/--; - $in_comment = 0; - } - - # Handle continued macro. - if ($in_macro) - { - $in_macro = 0 unless /\\$/; - next; - } - - # Handle start of macro (or any preprocessor directive). - if (/^\s*\#/) - { - $in_macro = 1 if /^([^\\]|\\.)*\\$/; - next; - } - - # Handle comments and quoted text. - while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy - { - my $match = $1; - if ($match eq "/*") - { - if (!s-/\*.*?\*/--) - { - s-/\*.*--; - $in_comment = 1; - } - } - elsif ($match eq "//") - { - s-//.*--; - } - else # ' or " - { - if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-) - { - warn "mismatched quotes at line $. in $file\n"; - s-$match.*--; - } - } - } - - if (/\w\.GetString *\(QUOTEDTEXT/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - ## Remove the first 3 chars and add newline - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - - ## C_ N_ Q_ and _ are the macros defined in gi8n.h - if (/[CNQ]?_ *\(QUOTEDTEXT/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - ## Remove the first 3 chars and add newline - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_xml) - { - open FILE, "<$file"; - - while () - { - # FIXME: share the pattern matching code with intltool-extract - if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/ || /translatable=\"yes\"/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_ini) - { - open FILE, "<$file"; - while () - { - if (/_(.*)=/) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - last; - } - } - close FILE; - } - - foreach my $file (@buf_i18n_xml_unmarked) - { - if (defined isNotValidMissing (unpack("x3 A*", $file))) { - push @buf_allfiles, unpack("x3 A*", $file) . "\n"; - } - } - - - @buf_allfiles_sorted = sort (@buf_allfiles); - @buf_potfiles_sorted = sort (@buf_potfiles); - - my %in2; - foreach (@buf_potfiles_sorted) - { - s#^$SRCDIR/../##; - s#^$SRCDIR/##; - $in2{$_} = 1; - } - - foreach (@buf_potfiles_ignore_sorted) - { - s#^$SRCDIR/../##; - s#^$SRCDIR/##; - $in2{$_} = 1; - } - - my @result; - - foreach (@buf_allfiles_sorted) - { - my $dummy = $_; - my $srcdir = $SRCDIR; - - $srcdir =~ s#^../##; - $dummy =~ s#^$srcdir/../##; - $dummy =~ s#^$srcdir/##; - $dummy =~ s#_build/##; - if (!exists($in2{$dummy})) - { - push @result, $dummy - } - } - - my @buf_potfiles_notexist; - - foreach (@buf_potfiles_sorted) - { - chomp (my $dummy = $_); - if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy")) - { - push @buf_potfiles_notexist, $_; - } - } - - ## Save file with information about the files missing - ## if any, and give information about this procedure. - if (@result + @buf_potfiles_notexist > 0) - { - if (@result) - { - print "\n" if $VERBOSE; - unlink "missing"; - open OUT, ">missing"; - print OUT @result; - close OUT; - warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n". - "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n"; - print STDERR @result, "\n"; - warn "If some of these files are left out on purpose then please add them to\n". - "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n". - "of left out files has been written in the current directory.\n"; - } - if (@buf_potfiles_notexist) - { - unlink "notexist"; - open OUT, ">notexist"; - print OUT @buf_potfiles_notexist; - close OUT; - warn "\n" if ($VERBOSE or @result); - warn "\e[1mThe following files do not exist anymore:\e[0m\n\n"; - warn @buf_potfiles_notexist, "\n"; - warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n". - "containing this list of absent files has been written in the current directory.\n"; - } - } - - ## If there is nothing to complain about, notify the user - else { - print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE; - } -} - -sub Console_WriteError_InvalidOption -{ - ## Handle invalid arguments - print STDERR "Try `${PROGRAM} --help' for more information.\n"; - exit 1; -} - -sub isProgramInPath -{ - my ($file) = @_; - # If either a file exists, or when run it returns 0 exit status - return 1 if ((-x $file) or (system("$file --version >$devnull") == 0)); - return 0; -} - -sub isGNUGettextTool -{ - my ($file) = @_; - # Check that we are using GNU gettext tools - if (isProgramInPath ($file)) - { - my $version = `$file --version`; - return 1 if ($version =~ m/.*\(GNU .*\).*/); - } - return 0; -} - -sub GenerateHeaders -{ - my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract"; - - ## Generate the .h header files, so we can allow glade and - ## xml translation support - if (! isProgramInPath ("$EXTRACT")) - { - print STDERR "\n *** The intltool-extract script wasn't found!" - ."\n *** Without it, intltool-update can not generate files.\n"; - exit; - } - else - { - open (FILE, $POTFILES_in) or die "$PROGRAM: POTFILES.in not found.\n"; - - while () - { - chomp; - next if /^\[\s*encoding/; - - ## Find xml files in POTFILES.in and generate the - ## files with help from the extract script - - my $gettext_type= &POFile_DetermineType ($1); - - if (/\.($xml_support|$ini_support)$/ || /^\[/) - { - s/^\[[^\[].*]\s*//; - - my $filename = "../$_"; - - if ($VERBOSE) - { - system ($EXTRACT, "--update", "--srcdir=$SRCDIR", - "--type=$gettext_type", $filename); - } - else - { - system ($EXTRACT, "--update", "--type=$gettext_type", - "--srcdir=$SRCDIR", "--quiet", $filename); - } - } - } - close FILE; - } -} - -# -# Generate .pot file from POTFILES.in -# -sub GeneratePOTemplate -{ - my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext"; - my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || ''; - chomp $XGETTEXT; - - if (! isGNUGettextTool ("$XGETTEXT")) - { - print STDERR " *** GNU xgettext is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - print "Building $MODULE.pot...\n" if $VERBOSE; - - open INFILE, $POTFILES_in; - unlink "POTFILES.in.temp"; - open OUTFILE, ">POTFILES.in.temp" or die("Cannot open POTFILES.in.temp for writing"); - - my $gettext_support_nonascii = 0; - - # checks for GNU gettext >= 0.12 - my $dummy = `$XGETTEXT --version --from-code=UTF-8 >$devnull 2>$devnull`; - if ($? == 0) - { - $gettext_support_nonascii = 1; - } - else - { - # urge everybody to upgrade gettext - print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n". - " strings. That means you should install a version of gettext\n". - " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n". - " or have to let non-ASCII strings untranslated. (If there is any)\n"; - } - - my $encoding = "ASCII"; - my $forced_gettext_code; - my @temp_headers; - my $encoding_problem_is_reported = 0; - - while () - { - next if (/^#/ or /^\s*$/); - - chomp; - - my $gettext_code; - - if (/^\[\s*encoding:\s*(.*)\s*\]/) - { - $forced_gettext_code=$1; - } - elsif (/\.($xml_support|$ini_support)$/ || /^\[/) - { - s/^\[.*]\s*//; - print OUTFILE "../$_.h\n"; - push @temp_headers, "../$_.h"; - $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code); - } - else - { - print OUTFILE "$SRCDIR/../$_\n"; - $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code); - } - - next if (! $gettext_support_nonascii); - - if (defined $forced_gettext_code) - { - $encoding=$forced_gettext_code; - } - elsif (defined $gettext_code and "$encoding" ne "$gettext_code") - { - if ($encoding eq "ASCII") - { - $encoding=$gettext_code; - } - elsif ($gettext_code ne "ASCII") - { - # Only report once because the message is quite long - if (! $encoding_problem_is_reported) - { - print STDERR "WARNING: You should use the same file encoding for all your project files,\n". - " but $PROGRAM thinks that most of the source files are in\n". - " $encoding encoding, while \"$_\" is (likely) in\n". - " $gettext_code encoding. If you are sure that all translatable strings\n". - " are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n". - " line to POTFILES.in:\n\n". - " [encoding: UTF-8]\n\n". - " and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n". - "(such warning message will only be reported once.)\n"; - $encoding_problem_is_reported = 1; - } - } - } - } - - close OUTFILE; - close INFILE; - - unlink "$MODULE.pot"; - my @xgettext_argument=("$XGETTEXT", - "--add-comments", - "--directory\=.", - "--default-domain\=$MODULE", - "--flag\=g_strdup_printf:1:c-format", - "--flag\=g_string_printf:2:c-format", - "--flag\=g_string_append_printf:2:c-format", - "--flag\=g_error_new:3:c-format", - "--flag\=g_set_error:4:c-format", - "--flag\=g_markup_printf_escaped:1:c-format", - "--flag\=g_log:3:c-format", - "--flag\=g_print:1:c-format", - "--flag\=g_printerr:1:c-format", - "--flag\=g_printf:1:c-format", - "--flag\=g_fprintf:2:c-format", - "--flag\=g_sprintf:2:c-format", - "--flag\=g_snprintf:3:c-format", - "--flag\=g_scanner_error:2:c-format", - "--flag\=g_scanner_warn:2:c-format", - "--output\=$MODULE\.pot", - "--files-from\=\.\/POTFILES\.in\.temp"); - my $XGETTEXT_KEYWORDS = &FindPOTKeywords; - push @xgettext_argument, $XGETTEXT_KEYWORDS; - my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress; - push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS; - push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii); - push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS; - my $xgettext_command = join ' ', @xgettext_argument; - - # intercept xgettext error message - print "Running $xgettext_command\n" if $VERBOSE; - my $xgettext_error_msg = `$xgettext_command 2>\&1`; - my $command_failed = $?; - - unlink "POTFILES.in.temp"; - - print "Removing generated header (.h) files..." if $VERBOSE; - unlink foreach (@temp_headers); - print "done.\n" if $VERBOSE; - - if (! $command_failed) - { - if (! -e "$MODULE.pot") - { - print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE; - } - else - { - print "Wrote $MODULE.pot\n" if $VERBOSE; - } - } - else - { - if ($xgettext_error_msg =~ /--from-code/) - { - # replace non-ASCII error message with a more useful one. - print STDERR "ERROR: xgettext failed to generate PO template file because there is non-ASCII\n". - " string marked for translation. Please make sure that all strings marked\n". - " for translation are in uniform encoding (say UTF-8), then \e[1m*prepend*\e[0m the\n". - " following line to POTFILES.in and rerun $PROGRAM:\n\n". - " [encoding: UTF-8]\n\n"; - } - else - { - print STDERR "$xgettext_error_msg"; - if (-e "$MODULE.pot") - { - # is this possible? - print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n". - " Please consult error message above if there is any.\n"; - } - else - { - print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n". - " error message above if there is any.\n"; - } - } - exit (1); - } -} - -sub POFile_Update -{ - -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n"; - - my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge"; - my ($lang, $outfile) = @_; - - if (! isGNUGettextTool ("$MSGMERGE")) - { - print STDERR " *** GNU msgmerge is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE; - - my $infile = "$SRCDIR/$lang.po"; - $outfile = "$SRCDIR/$lang.po" if ($outfile eq ""); - - # I think msgmerge won't overwrite old file if merge is not successful - system ("$MSGMERGE", "-o", $outfile, $infile, "$MODULE.pot"); -} - -sub Console_WriteError_NotExisting -{ - my ($file) = @_; - - ## Report error if supplied language file is non-existing - print STDERR "$PROGRAM: $file does not exist!\n"; - print STDERR "Try '$PROGRAM --help' for more information.\n"; - exit; -} - -sub GatherPOFiles -{ - my @po_files = glob ("./*.po"); - - @languages = map (&POFile_GetLanguage, @po_files); - - foreach my $lang (@languages) - { - $po_files_by_lang{$lang} = shift (@po_files); - } -} - -sub POFile_GetLanguage ($) -{ - s/^(.*\/)?(.+)\.po$/$2/; - return $_; -} - -sub Console_Write_TranslationStatus -{ - my ($lang, $output_file) = @_; - my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; - - if (! isGNUGettextTool ("$MSGFMT")) - { - print STDERR " *** GNU msgfmt is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - $output_file = "$SRCDIR/$lang.po" if ($output_file eq ""); - - system ("$MSGFMT", "-o", "$devnull", "--verbose", $output_file); -} - -sub Console_Write_CoverageReport -{ - my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt"; - - if (! isGNUGettextTool ("$MSGFMT")) - { - print STDERR " *** GNU msgfmt is not found on this system!\n". - " *** Without it, intltool-update can not extract strings.\n"; - exit; - } - - &GatherPOFiles; - - foreach my $lang (@languages) - { - print STDERR "$lang: "; - &POFile_Update ($lang, ""); - } - - print STDERR "\n\n * Current translation support in $MODULE \n\n"; - - foreach my $lang (@languages) - { - print STDERR "$lang: "; - system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po"); - } -} - -sub SubstituteVariable -{ - my ($str) = @_; - - # always need to rewind file whenever it has been accessed - seek (CONF, 0, 0); - - # cache each variable. varhash is global to we can add - # variables elsewhere. - while () - { - if (/^(\w+)=(.*)$/) - { - ($varhash{$1} = $2) =~ s/^["'](.*)["']$/$1/; - } - } - - if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) - { - my $rest = $3; - my $untouched = $1; - my $sub = ""; - # Ignore recursive definitions of variables - $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; - - return SubstituteVariable ("$untouched$sub$rest"); - } - - # We're using Perl backticks ` and "echo -n" here in order to - # expand any shell escapes (such as backticks themselves) in every variable - return echo_n ($str); -} - -sub CONF_Handle_Open -{ - my $base_dirname = getcwd(); - $base_dirname =~ s@.*/@@; - - my ($conf_in, $src_dir); - - if ($base_dirname =~ /^po(-.+)?$/) - { - if (-f "Makevars") - { - my $makefile_source; - - local (*IN); - open (IN, ") - { - if (/^top_builddir[ \t]*=/) - { - $src_dir = $_; - $src_dir =~ s/^top_builddir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; - - chomp $src_dir; - if (-f "$src_dir" . "/configure.ac") { - $conf_in = "$src_dir" . "/configure.ac" . "\n"; - } else { - $conf_in = "$src_dir" . "/configure.in" . "\n"; - } - last; - } - } - close IN; - - $conf_in || die "Cannot find top_builddir in Makevars."; - } - elsif (-f "$SRCDIR/../configure.ac") - { - $conf_in = "$SRCDIR/../configure.ac"; - } - elsif (-f "$SRCDIR/../configure.in") - { - $conf_in = "$SRCDIR/../configure.in"; - } - else - { - my $makefile_source; - - local (*IN); - open (IN, ") - { - if (/^top_srcdir[ \t]*=/) - { - $src_dir = $_; - $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/; - - chomp $src_dir; - $conf_in = "$src_dir" . "/configure.in" . "\n"; - - last; - } - } - close IN; - - $conf_in || die "Cannot find top_srcdir in Makefile."; - } - - open (CONF, "<$conf_in"); - } - else - { - print STDERR "$PROGRAM: Unable to proceed.\n" . - "Make sure to run this script inside the po directory.\n"; - exit; - } -} - -sub FindPackageName -{ - my $version; - my $domain = &FindMakevarsDomain; - my $name = $domain || "untitled"; - - &CONF_Handle_Open; - - my $conf_source; { - local (*IN); - open (IN, "<&CONF") || return $name; - seek (IN, 0, 0); - local $/; # slurp mode - $conf_source = ; - close IN; - } - - # priority for getting package name: - # 1. GETTEXT_PACKAGE - # 2. first argument of AC_INIT (with >= 2 arguments) - # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument) - - # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m - # the \s makes this not work, why? - if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m) - { - ($name, $version) = ($1, $2); - $name =~ s/[\[\]\s]//g; - $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); - } - - if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m) - { - ($name, $version) = ($1, $2); - $name =~ s/[\[\]\s]//g; - $version =~ s/[\[\]\s]//g; - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); - } - - # \s makes this not work, why? - $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m; - - # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value - # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables. - $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g; - - $name = $domain if $domain; - - $name = SubstituteVariable ($name); - $name =~ s/^["'](.*)["']$/$1/; - - return $name if $name; -} - - -sub FindPOTKeywords -{ - - my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_ --keyword\=Q\_"; - my $varname = "XGETTEXT_OPTIONS"; - my $make_source; { - local (*IN); - open (IN, "; - close IN; - } - - # unwrap lines split with a trailing \ - $make_source =~ s/\\ $ \n/ /mxg; - $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m; - - return $keywords; -} - -sub FindMakevarsDomain -{ - - my $domain = ""; - my $makevars_source; { - local (*IN); - open (IN, "; - close IN; - } - - $domain = $1 if $makevars_source =~ /^DOMAIN[ ]*=\[?([^\n\]\$]+)/m; - $domain =~ s/^\s+//; - $domain =~ s/\s+$//; - - return $domain; -} - -sub FindMakevarsBugAddress -{ - - my $address = ""; - my $makevars_source; { - local (*IN); - open (IN, "; - close IN; - } - - $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m; - $address =~ s/^\s+//; - $address =~ s/\s+$//; - - return $address; -} diff -Nru vinagre-2.26.1/ltmain.sh vinagre-2.29.1/ltmain.sh --- vinagre-2.26.1/ltmain.sh 2009-04-13 14:35:25.000000000 +0100 +++ vinagre-2.29.1/ltmain.sh 2009-10-26 13:35:18.000000000 +0000 @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.4 +# ltmain.sh (GNU libtool) 2.2.6 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu4 +# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.4 Debian-2.2.4-0ubuntu4" +VERSION="2.2.6 Debian-2.2.6a-4" TIMESTAMP="" -package_revision=1.2976 +package_revision=1.3012 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -805,7 +805,7 @@ case $host in - *cygwin* | *mingw* | *pw32*) + *cygwin* | *mingw* | *pw32* | *cegcc*) # don't eliminate duplications in $postdeps and $predeps opt_duplicate_compiler_generated_deps=: ;; @@ -893,8 +893,9 @@ # determined imposters. func_lalib_p () { - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null \ + | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 } # func_lalib_unsafe_p file @@ -907,7 +908,7 @@ func_lalib_unsafe_p () { lalib_p=no - if test -r "$1" && exec 5<&0 <"$1"; then + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then for lalib_p_l in 1 2 3 4 do read lalib_p_line @@ -1275,7 +1276,7 @@ # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in - cygwin* | mingw* | pw32* | os2*) + cygwin* | mingw* | pw32* | os2* | cegcc*) pic_mode=default ;; esac @@ -2046,7 +2047,7 @@ 'exit $?' tstripme="$stripme" case $host_os in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) tstripme="" @@ -2152,7 +2153,7 @@ # Do a test to see if this is really a libtool program. case $host in - *cygwin*|*mingw*) + *cygwin* | *mingw*) if func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" wrapper=$func_ltwrapper_scriptname_result @@ -2358,7 +2359,7 @@ $RM $export_symbols eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in - *cygwin* | *mingw* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' ;; @@ -2370,7 +2371,7 @@ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin | *mingw* ) + *cygwin | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -2426,7 +2427,7 @@ } lt_dlsymlist; " case $host in - *cygwin* | *mingw* ) + *cygwin* | *mingw* | *cegcc* ) $ECHO >> "$output_objdir/$my_dlsyms" "\ /* DATA imports from DLLs on WIN32 con't be const, because runtime relocations are performed -- see ld's documentation @@ -2512,7 +2513,7 @@ # Transform the symbol file into the correct name. symfileobj="$output_objdir/${my_outputname}S.$objext" case $host in - *cygwin* | *mingw* ) + *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` @@ -2691,25 +2692,16 @@ -# func_emit_wrapper arg +# func_emit_wrapper_part1 [arg=no] # -# emit a libtool wrapper script on stdout -# don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variable -# set therein. -# -# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the '.lib' directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () +# Emit the first part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part1 () { - func_emit_wrapper_arg1=no + func_emit_wrapper_part1_arg1=no if test -n "$1" ; then - func_emit_wrapper_arg1=$1 + func_emit_wrapper_part1_arg1=$1 fi $ECHO "\ @@ -2794,10 +2786,27 @@ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` done +" +} +# end: func_emit_wrapper_part1 + +# func_emit_wrapper_part2 [arg=no] +# +# Emit the second part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part2 () +{ + func_emit_wrapper_part2_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part2_arg1=$1 + fi + + $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -2888,7 +2897,7 @@ " case $host in # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) + *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} " @@ -2914,7 +2923,207 @@ fi\ " } -# end: func_emit_wrapper +# end: func_emit_wrapper_part2 + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=no + if test -n "$1" ; then + func_emit_wrapper_arg1=$1 + fi + + # split this up so that func_emit_cwrapperexe_src + # can call each part independently. + func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" + func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" +} + + +# func_to_host_path arg +# +# Convert paths to host format when used with build tools. +# Intended for use with "native" mingw (where libtool itself +# is running under the msys shell), or in the following cross- +# build environments: +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# where wine is equipped with the `winepath' executable. +# In the native mingw case, the (msys) shell automatically +# converts paths for any non-msys applications it launches, +# but that facility isn't available from inside the cwrapper. +# Similar accommodations are necessary for $host mingw and +# $build cygwin. Calling this function does no harm for other +# $host/$build combinations not listed above. +# +# ARG is the path (on $build) that should be converted to +# the proper representation for $host. The result is stored +# in $func_to_host_path_result. +func_to_host_path () +{ + func_to_host_path_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + case $build in + *mingw* ) # actually, msys + # awkward: cmd appends spaces to result + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_path_tmp1=`( cmd //c echo "$1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_path_tmp1=`cygpath -w "$1"` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # Unfortunately, winepath does not exit with a non-zero + # error code, so we are forced to check the contents of + # stdout. On the other hand, if the command is not + # found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both + # error code of zero AND non-empty stdout, which explains + # the odd construction: + func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + else + # Allow warning below. + func_to_host_path_result="" + fi + ;; + esac + if test -z "$func_to_host_path_result" ; then + func_error "Could not determine host path corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_path_result="$1" + fi + ;; + esac + fi +} +# end: func_to_host_path + +# func_to_host_pathlist arg +# +# Convert pathlists to host format when used with build tools. +# See func_to_host_path(), above. This function supports the +# following $build/$host combinations (but does no harm for +# combinations not listed here): +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# +# Path separators are also converted from $build format to +# $host format. If ARG begins or ends with a path separator +# character, it is preserved (but converted to $host format) +# on output. +# +# ARG is a pathlist (on $build) that should be converted to +# the proper representation on $host. The result is stored +# in $func_to_host_pathlist_result. +func_to_host_pathlist () +{ + func_to_host_pathlist_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_to_host_pathlist_tmp2="$1" + # Once set for this call, this variable should not be + # reassigned. It is used in tha fallback case. + func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e 's|^:*||' -e 's|:*$||'` + case $build in + *mingw* ) # Actually, msys. + # Awkward: cmd appends spaces to result. + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # unfortunately, winepath doesn't convert pathlists + func_to_host_pathlist_result="" + func_to_host_pathlist_oldIFS=$IFS + IFS=: + for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do + IFS=$func_to_host_pathlist_oldIFS + if test -n "$func_to_host_pathlist_f" ; then + func_to_host_path "$func_to_host_pathlist_f" + if test -n "$func_to_host_path_result" ; then + if test -z "$func_to_host_pathlist_result" ; then + func_to_host_pathlist_result="$func_to_host_path_result" + else + func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" + fi + fi + fi + IFS=: + done + IFS=$func_to_host_pathlist_oldIFS + ;; + esac + if test -z "$func_to_host_pathlist_result" ; then + func_error "Could not determine the host path(s) corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This may break if $1 contains DOS-style drive + # specifications. The fix is not to complicate the expression + # below, but for the user to provide a working wine installation + # with winepath so that path translation in the cross-to-mingw + # case works properly. + lt_replace_pathsep_nix_to_dos="s|:|;|g" + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_replace_pathsep_nix_to_dos"` + fi + # Now, add the leading and trailing path separators back + case "$1" in + :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" + ;; + esac + case "$1" in + *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + ;; + esac + ;; + esac + fi +} +# end: func_to_host_pathlist # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -2951,6 +3160,12 @@ # include # ifdef __CYGWIN__ # include +# define HAVE_SETENV +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif # endif #endif #include @@ -3057,29 +3272,105 @@ int check_executable (const char *path); char *strendzap (char *str, const char *pat); void lt_fatal (const char *message, ...); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_opt_process_env_set (const char *arg); +void lt_opt_process_env_prepend (const char *arg); +void lt_opt_process_env_append (const char *arg); +int lt_split_name_value (const char *arg, char** name, char** value); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); -static const char *script_text = +static const char *script_text_part1 = EOF - func_emit_wrapper yes | + func_emit_wrapper_part1 yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ "/' -e 's/$/\\n"/' + echo ";" + cat </dev/null || echo $SHELL` - case $lt_newargv0 in - *.exe | *.EXE) ;; - *) lt_newargv0=$lt_newargv0.exe ;; - esac - ;; - * ) lt_newargv0=$SHELL ;; - esac - fi - - cat <"))); + for (i = 0; i < newargc; i++) { - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, newargz[i])); + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); } EOF case $host_os in mingw*) - cat <"), + (value ? value : ""))); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); +#else + int len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } +#endif + } +} + +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + int orig_value_len = strlen (orig_value); + int add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} + +int +lt_split_name_value (const char *arg, char** name, char** value) +{ + const char *p; + int len; + if (!arg || !*arg) + return 1; + + p = strchr (arg, (int)'='); + + if (!p) + return 1; + + *value = xstrdup (++p); + + len = strlen (arg) - strlen (*value); + *name = XMALLOC (char, len); + strncpy (*name, arg, len-1); + (*name)[len - 1] = '\0'; + + return 0; +} + +void +lt_opt_process_env_set (const char *arg) +{ + char *name = NULL; + char *value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); + } + + lt_setenv (name, value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_prepend (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_append (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 1); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + +void +lt_update_exe_path (const char *name, const char *value) +{ + LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + int len = strlen (new_value); + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[len-1] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +void +lt_update_lib_path (const char *name, const char *value) +{ + LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} + + EOF } # end: func_emit_cwrapperexe_src @@ -3515,7 +4033,7 @@ { $opt_debug case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out # which system we are compiling for in order to pass an extra @@ -3959,6 +4477,13 @@ -L*) func_stripname '-L' '' "$arg" dir=$func_stripname_result + if test -z "$dir"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -3977,14 +4502,16 @@ ;; esac case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; + ::) dllsearchpath=$dir;; *) dllsearchpath="$dllsearchpath:$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; @@ -3995,7 +4522,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) # These systems don't actually have a C or math library (as such) continue ;; @@ -4072,7 +4599,7 @@ -no-install) case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. func_warning "\`-no-install' is ignored for $host" @@ -4820,19 +5347,19 @@ # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done continue fi # $pass = conv @@ -5032,7 +5559,7 @@ if test -n "$library_names" && { test "$use_static_libs" = no || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw*) + *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded notinst_deplibs="$notinst_deplibs $lib" need_relink=no @@ -5102,7 +5629,7 @@ elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw*) + *cygwin* | mingw* | *cegcc*) func_arith $current - $age major=$func_arith_result versuffix="-$major" @@ -5369,6 +5896,7 @@ if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) @@ -5884,7 +6412,7 @@ tempremovelist=`$ECHO "$output_objdir/*"` for p in $tempremovelist; do case $p in - *.$objext) + *.$objext | *.gcno) ;; $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) if test "X$precious_files_regex" != "X"; then @@ -5955,7 +6483,7 @@ if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) @@ -6454,7 +6982,7 @@ orig_export_symbols= case $host_os in - cygwin* | mingw*) + cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile if test "x`$SED 1q $export_symbols`" != xEXPORTS; then @@ -7079,14 +7607,16 @@ esac fi case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; *) dllsearchpath="$dllsearchpath:$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; @@ -7156,6 +7686,10 @@ wrappers_required=no fi ;; + *cegcc) + # Disable wrappers for cegcc, we are cross compiling anyway. + wrappers_required=no + ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -7308,11 +7842,10 @@ func_emit_cwrapperexe_src > $cwrappersource - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. $opt_dry_run || { $LTCC $LTCFLAGS -o $cwrapper $cwrappersource $STRIP $cwrapper @@ -7597,7 +8130,7 @@ # place dlname in correct position for cygwin tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac $ECHO > $output "\ # $outputname - a libtool library file diff -Nru vinagre-2.26.1/Makefile.am vinagre-2.29.1/Makefile.am --- vinagre-2.26.1/Makefile.am 2008-06-13 18:06:26.000000000 +0100 +++ vinagre-2.29.1/Makefile.am 2009-08-25 02:03:32.000000000 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = src help po data +SUBDIRS = vinagre help po data plugins plugin-loaders vinagredocdir = ${datadir}/doc/vinagre vinagredoc_DATA = \ @@ -21,6 +21,22 @@ intltool-merge \ intltool-update +MAINTAINERCLEANFILES = \ + compile \ + aclocal.m4 \ + config.guess \ + config.h.in \ + config.sub \ + depcomp \ + gnome-doc-utils.make \ + install-sh \ + ltmain.sh \ + missing \ + mkinstalldirs \ + omf.make \ + xmldocs.make \ + `find "$(srcdir)" -type f -name Makefile.in -print` + DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper # Copy all the spec files. Of cource, only one is actually used. @@ -31,3 +47,4 @@ fi \ done +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/Makefile.in vinagre-2.29.1/Makefile.in --- vinagre-2.26.1/Makefile.in 2009-04-13 14:35:37.000000000 +0100 +++ vinagre-2.29.1/Makefile.in 2009-10-26 13:35:27.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -61,12 +70,29 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(vinagredocdir)" -vinagredocDATA_INSTALL = $(INSTALL_DATA) DATA = $(vinagredoc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -74,17 +100,44 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLET_CFLAGS = @APPLET_CFLAGS@ APPLET_LIBS = @APPLET_LIBS@ AR = @AR@ @@ -130,29 +183,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -160,6 +194,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -170,6 +205,7 @@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ @@ -179,10 +215,12 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -192,11 +230,23 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ @@ -248,9 +298,10 @@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = src help po data +SUBDIRS = vinagre help po data plugins plugin-loaders vinagredocdir = ${datadir}/doc/vinagre vinagredoc_DATA = \ README\ @@ -272,6 +323,22 @@ intltool-merge \ intltool-update +MAINTAINERCLEANFILES = \ + compile \ + aclocal.m4 \ + config.guess \ + config.h.in \ + config.sub \ + depcomp \ + gnome-doc-utils.make \ + install-sh \ + ltmain.sh \ + missing \ + mkinstalldirs \ + omf.make \ + xmldocs.make \ + `find "$(srcdir)" -type f -name Makefile.in -print` + all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -282,15 +349,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -306,9 +373,10 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 @if test ! -f $@; then \ @@ -320,7 +388,7 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -334,24 +402,27 @@ -rm -rf .libs _libs distclean-libtool: - -rm -f libtool + -rm -f libtool config.lt install-vinagredocDATA: $(vinagredoc_DATA) @$(NORMAL_INSTALL) test -z "$(vinagredocdir)" || $(MKDIR_P) "$(DESTDIR)$(vinagredocdir)" - @list='$(vinagredoc_DATA)'; for p in $$list; do \ + @list='$(vinagredoc_DATA)'; test -n "$(vinagredocdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(vinagredocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(vinagredocdir)/$$f'"; \ - $(vinagredocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(vinagredocdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(vinagredocdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(vinagredocdir)" || exit $$?; \ done uninstall-vinagredocDATA: @$(NORMAL_UNINSTALL) - @list='$(vinagredoc_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(vinagredocdir)/$$f'"; \ - rm -f "$(DESTDIR)$(vinagredocdir)/$$f"; \ - done + @list='$(vinagredoc_DATA)'; test -n "$(vinagredocdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(vinagredocdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(vinagredocdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -377,7 +448,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -411,16 +482,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -428,14 +499,14 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -447,7 +518,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ @@ -456,36 +527,41 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) + test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -501,29 +577,44 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -531,11 +622,12 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -548,6 +640,10 @@ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -576,6 +672,8 @@ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -587,9 +685,11 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -611,13 +711,15 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -662,11 +764,13 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -683,6 +787,8 @@ html: html-recursive +html-am: + info: info-recursive info-am: @@ -691,18 +797,28 @@ install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -725,14 +841,14 @@ uninstall-am: uninstall-vinagredocDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ + dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -753,6 +869,9 @@ cp -p $$specfile $(distdir); \ fi \ done + +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru vinagre-2.26.1/missing vinagre-2.29.1/missing --- vinagre-2.26.1/missing 2009-04-13 14:35:35.000000000 +0100 +++ vinagre-2.29.1/missing 2009-10-26 13:35:25.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru vinagre-2.26.1/mkinstalldirs vinagre-2.29.1/mkinstalldirs --- vinagre-2.26.1/mkinstalldirs 2009-04-13 14:35:37.000000000 +0100 +++ vinagre-2.29.1/mkinstalldirs 2009-10-26 13:35:27.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -scriptversion=2006-05-11.19 +scriptversion=2009-04-28.21; # UTC # Original author: Noah Friedman # Created: 1993-05-16 @@ -157,5 +157,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru vinagre-2.26.1/NEWS vinagre-2.29.1/NEWS --- vinagre-2.26.1/NEWS 2009-04-13 14:34:53.000000000 +0100 +++ vinagre-2.29.1/NEWS 2009-10-26 13:33:08.000000000 +0000 @@ -1,3 +1,176 @@ +Vinagre 2.29.1 +============== + + Features + + + Added a listener mode (similar to vncviewer -listen) + + Added ability to request an screen update + + Added ability to change depth color + + Added ability to use JPEG compression (lossy encoding) + + Added an toolbar in bookmarks panel + + Use AM_SILENT_RULES if available + + Requires gtk-vnc 0.3.10 + + Fixes + + + Fix warnings and crashes activating bookmarks + + Keep the aspect ratio when using scaling mode + + UI translations: + + + Adi Roiban (ro) + + Amitakhya Phukan (as) + + Andrea Zagli (it) + + Ani (ml) + + Ask H. Larsen (da) + + Branko Kokanović (sr) (sr@latin) + + Bruce Cowan (en_GB) + + Carles Ferrando (ca@valencia) + + drtvasudevan (ta) + + Gabor Kelemen (hu) + + Gintautas Miliauskas (lt) + + Ivar Smolin (et) + + Joan Duran (ca) + + Jorge González (es) + + Kostas Papadimas (el) + + krishnababu k (te) + + Manoj Kumar Giri (or) + + Matej Urbančič (sl) + + Maxim V. Dziumanenko (uk) + + Petr Kovar (cs) + + Rajesh Ranjan (hi) + + Rajesh Ranjan (mai) + + Shankar Prasad (kn) + + Doc translations: + + Petr Kovar (cs) + + Sterios Prosiniklis (el) + +Vinagre 2.27.92 +=============== + + Features and Fixes + + + Removed duplicated names in the UI file, avoiding crashes (Robert Ancell). + + Show IP addresses of avahi-discovered machines instead of names (Jonh Wendell). + + Handle GConf errors in preferences (Matthias Clasen). + + UI translations: + + + A S Alam (pa) + + Baris Cicek (tr) + + Branko Kokanović (sr) (sr@latin) + + Changwoo Ryu (ko) + + Duarte Loreto (pt) + + ifelix (ta) + + Inaki Larranaga Murgoitio (eu) + + Jamil Ahmed (bn) + + Khaled Hosny (ar) + + Kjartan Maraas (nb) + + krishnababu k (te) + + Mario Blättermann (de) + + Sandeep Shedmake (mr) + + Shankar Prasad (kn) + + Sweta Kothari (gu) + + Tomasz Dominikowski (pl) + + Tommi Vainikainen (fi) + + Doc translations: + + Jonh Wendell (pt_BR) + + Jorge González (es) + + Mario Blättermann (de) + +Vinagre 2.27.91 +=============== + + Features and Fixes + + + Updated Unix man page (Emilio Monfort). + + Improvements in Telepathy tubes (Arnaud Maillet). + + Toolbar in full screen mode is now centralized. + + Updated documentation (help). + + UI translations: + + Alexander Shopov (bg) + + Antón Méixome (gl) + + Chao-Hsiung Liao (zh_HK) (zh_TW) + + Claude Paroz (fr) + + Daniel Nylander (sv) + + Ivar Smolin (et) + + Krix Apolinário, Henrique Machado (pt_BR) + + Jorge González (es) + + Manoj Kumar Giri (or) + + Mattias Põldaru (et) + + Priit Laes (et) + + Runa Bhattacharjee (bn_IN) + + Seán de Búrca (ga) + + Tommi Vainikainen (fi) + + Doc translations: + + Mario Blättermann (de) + + Milo Casagrande (it) + +Vinagre 2.27.90 +=============== + + Features and Fixes + + Use GtkBuilder instead of Glade. + + Added a *very basic* SSH plugin. Enable it with --enable-ssh in configure. + + Panel applet is now optional. Disable it with --disable-applet. + + Toolbar in fullscreen mode is now centralized. + + Screenshot can be saved in various formats. + + New fullscreen command-line option. + + New scaled command-line option. + + If the server is omitted in the command line, 'localhost' is assumed. + + Clipboard operations work even with special chars. + + UI translations: + + Antón Méixome (gl) + + Chao-Hsiung Liao (zh_HK) (zh_TW) + + Claude Paroz (fr) + + Daniel Nylander (sv) + + Ivar Smolin (et) + + Jochen Skulj (de) + + Jorge González (es) + + Kjartan Maraas (nb) + + Mattias Põldaru (et) + +Vinagre 2.27.5 +============== + + Features and Fixes + + New plugin system. All protocols should be implemented as a plugin. + Initially we have only VNC plugin. + + Telepathy tubes support. This allows you to access a screen of an + IM contact. + + Lots of minor fixes. + + Some regressions? File a bug please! + + UI translations: + + Alexander Shopov (bg) + + A S Alam (pa) + + Daniel Nylander (sv) + + drtvasudevan (ta) + + Ilkka Tuohela (fi) + + Ivar Smolin (et) + + Jorge Gonzalez (es) + + Kjartan Maraas (nb) + + Luca Ferretti (it) + + Lucas Lommer (cs) + + Manoj Kumar Giri (or) + + Marios Zindilis (el) + + Mattias Põldaru (et) + + Maxim V. Dziumanenko (uk) + + Nathan-J. Hirschauer (de) + + Runa Bhattacharjee (bn_IN) + + Yaron Shahrabani (he) + + Doc translations: + + Fotis Tsamis (el) + + Łukasz Jernaś (pl) + + Petr Kovar (cs) + + TeliuTe (zh_CN) + Vinagre 2.26.1 ============== diff -Nru vinagre-2.26.1/plugin-loaders/c/Makefile.am vinagre-2.29.1/plugin-loaders/c/Makefile.am --- vinagre-2.26.1/plugin-loaders/c/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugin-loaders/c/Makefile.am 2009-07-30 15:04:40.000000000 +0100 @@ -0,0 +1,24 @@ +# C plugin loader + +loaderdir = $(libdir)/vinagre-1/plugin-loaders + +INCLUDES = \ + -I$(top_srcdir) \ + $(VINAGRE_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + -DVINAGRE_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" + +loader_LTLIBRARIES = libcloader.la + +NOINST_H_FILES = \ + vinagre-plugin-loader-c.h + +libcloader_la_SOURCES = \ + vinagre-plugin-loader-c.c \ + $(NOINST_H_FILES) + +libcloader_la_LDFLAGS = $(LOADER_LIBTOOL_FLAGS) +libcloader_la_LIBADD = $(VINAGRE_LIBS) + +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/plugin-loaders/c/Makefile.in vinagre-2.29.1/plugin-loaders/c/Makefile.in --- vinagre-2.26.1/plugin-loaders/c/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugin-loaders/c/Makefile.in 2009-10-26 13:35:25.000000000 +0000 @@ -0,0 +1,613 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# C plugin loader + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = plugin-loaders/c +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(loaderdir)" +LTLIBRARIES = $(loader_LTLIBRARIES) +am__DEPENDENCIES_1 = +libcloader_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_1 = +am_libcloader_la_OBJECTS = vinagre-plugin-loader-c.lo $(am__objects_1) +libcloader_la_OBJECTS = $(am_libcloader_la_OBJECTS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +libcloader_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libcloader_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libcloader_la_SOURCES) +DIST_SOURCES = $(libcloader_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPLET_CFLAGS = @APPLET_CFLAGS@ +APPLET_LIBS = @APPLET_LIBS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVAHI_CFLAGS = @AVAHI_CFLAGS@ +AVAHI_LIBS = @AVAHI_LIBS@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +REBUILD = @REBUILD@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ +STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ +VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ +VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WARN_CFLAGS = @WARN_CFLAGS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +loaderdir = $(libdir)/vinagre-1/plugin-loaders +INCLUDES = \ + -I$(top_srcdir) \ + $(VINAGRE_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + -DVINAGRE_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" + +loader_LTLIBRARIES = libcloader.la +NOINST_H_FILES = \ + vinagre-plugin-loader-c.h + +libcloader_la_SOURCES = \ + vinagre-plugin-loader-c.c \ + $(NOINST_H_FILES) + +libcloader_la_LDFLAGS = $(LOADER_LIBTOOL_FLAGS) +libcloader_la_LIBADD = $(VINAGRE_LIBS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugin-loaders/c/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugin-loaders/c/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-loaderLTLIBRARIES: $(loader_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(loaderdir)" || $(MKDIR_P) "$(DESTDIR)$(loaderdir)" + @list='$(loader_LTLIBRARIES)'; test -n "$(loaderdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(loaderdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(loaderdir)"; \ + } + +uninstall-loaderLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(loader_LTLIBRARIES)'; test -n "$(loaderdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(loaderdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(loaderdir)/$$f"; \ + done + +clean-loaderLTLIBRARIES: + -test -z "$(loader_LTLIBRARIES)" || rm -f $(loader_LTLIBRARIES) + @list='$(loader_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libcloader.la: $(libcloader_la_OBJECTS) $(libcloader_la_DEPENDENCIES) + $(AM_V_CCLD)$(libcloader_la_LINK) -rpath $(loaderdir) $(libcloader_la_OBJECTS) $(libcloader_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-plugin-loader-c.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(loaderdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-loaderLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-loaderLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-loaderLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-loaderLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-loaderLTLIBRARIES install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-loaderLTLIBRARIES + + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru vinagre-2.26.1/plugin-loaders/c/vinagre-plugin-loader-c.c vinagre-2.29.1/plugin-loaders/c/vinagre-plugin-loader-c.c --- vinagre-2.26.1/plugin-loaders/c/vinagre-plugin-loader-c.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugin-loaders/c/vinagre-plugin-loader-c.c 2009-07-27 12:59:28.000000000 +0100 @@ -0,0 +1,182 @@ +/* + * vinagre-plugin-loader-c.c + * This file is part of vinagre + * + * Copyright (C) 2008 - Jesse van den Kieboom + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "vinagre-plugin-loader-c.h" +#include + +#define VINAGRE_PLUGIN_LOADER_C_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderCPrivate)) + +struct _VinagrePluginLoaderCPrivate +{ + GHashTable *loaded_plugins; +}; + +static void vinagre_plugin_loader_iface_init (gpointer g_iface, gpointer iface_data); + +VINAGRE_PLUGIN_LOADER_REGISTER_TYPE (VinagrePluginLoaderC, vinagre_plugin_loader_c, G_TYPE_OBJECT, vinagre_plugin_loader_iface_init); + + +static const gchar * +vinagre_plugin_loader_iface_get_id (void) +{ + return "C"; +} + +static VinagrePlugin * +vinagre_plugin_loader_iface_load (VinagrePluginLoader *loader, + VinagrePluginInfo *info, + const gchar *path) +{ + VinagrePluginLoaderC *cloader = VINAGRE_PLUGIN_LOADER_C (loader); + VinagreObjectModule *module; + const gchar *module_name; + VinagrePlugin *result; + + module = (VinagreObjectModule *)g_hash_table_lookup (cloader->priv->loaded_plugins, info); + module_name = vinagre_plugin_info_get_module_name (info); + + if (module == NULL) + { + /* For now we force all modules to be resident */ + module = vinagre_object_module_new (module_name, + path, + "register_vinagre_plugin", + TRUE); + + /* Infos are available for all the lifetime of the loader. + * If this changes, we should use weak refs or something */ + + g_hash_table_insert (cloader->priv->loaded_plugins, info, module); + } + + if (!g_type_module_use (G_TYPE_MODULE (module))) + { + g_warning ("Could not load plugin module: %s", vinagre_plugin_info_get_name (info)); + + return NULL; + } + + /* TODO: for now we force data-dir-name = module-name... if needed we can + * add a datadir field to the plugin descriptor file. + */ + result = (VinagrePlugin *)vinagre_object_module_new_object (module, + "install-dir", path, + "data-dir-name", module_name, + NULL); + + if (!result) + { + g_warning ("Could not create plugin object: %s", vinagre_plugin_info_get_name (info)); + g_type_module_unuse (G_TYPE_MODULE (module)); + + return NULL; + } + + g_type_module_unuse (G_TYPE_MODULE (module)); + + return result; +} + +static void +vinagre_plugin_loader_iface_unload (VinagrePluginLoader *loader, + VinagrePluginInfo *info) +{ + //VinagrePluginLoaderC *cloader = VINAGRE_PLUGIN_LOADER_C (loader); + + /* this is a no-op, since the type module will be properly unused as + the last reference to the plugin dies. When the plugin is activated + again, the library will be reloaded */ +} + +static void +vinagre_plugin_loader_iface_init (gpointer g_iface, + gpointer iface_data) +{ + VinagrePluginLoaderInterface *iface = (VinagrePluginLoaderInterface *)g_iface; + + iface->get_id = vinagre_plugin_loader_iface_get_id; + iface->load = vinagre_plugin_loader_iface_load; + iface->unload = vinagre_plugin_loader_iface_unload; +} + +static void +vinagre_plugin_loader_c_finalize (GObject *object) +{ + VinagrePluginLoaderC *cloader = VINAGRE_PLUGIN_LOADER_C (object); + GList *infos; + GList *item; + + /* FIXME: this sanity check it's not efficient. Let's remove it + * once we are confident with the code */ + + infos = g_hash_table_get_keys (cloader->priv->loaded_plugins); + + for (item = infos; item; item = item->next) + { + VinagrePluginInfo *info = (VinagrePluginInfo *)item->data; + + if (vinagre_plugin_info_is_active (info)) + { + g_warning ("There are still C plugins loaded during destruction"); + break; + } + } + + g_list_free (infos); + + g_hash_table_destroy (cloader->priv->loaded_plugins); + + G_OBJECT_CLASS (vinagre_plugin_loader_c_parent_class)->finalize (object); +} + +static void +vinagre_plugin_loader_c_class_init (VinagrePluginLoaderCClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = vinagre_plugin_loader_c_finalize; + + g_type_class_add_private (object_class, sizeof (VinagrePluginLoaderCPrivate)); +} + +static void +vinagre_plugin_loader_c_class_finalize (VinagrePluginLoaderCClass *klass) +{ +} + +static void +vinagre_plugin_loader_c_init (VinagrePluginLoaderC *self) +{ + self->priv = VINAGRE_PLUGIN_LOADER_C_GET_PRIVATE (self); + + /* loaded_plugins maps VinagrePluginInfo to a VinagreObjectModule */ + self->priv->loaded_plugins = g_hash_table_new (g_direct_hash, + g_direct_equal); +} + +VinagrePluginLoaderC * +vinagre_plugin_loader_c_new () +{ + GObject *loader = g_object_new (VINAGRE_TYPE_PLUGIN_LOADER_C, NULL); + + return VINAGRE_PLUGIN_LOADER_C (loader); +} diff -Nru vinagre-2.26.1/plugin-loaders/c/vinagre-plugin-loader-c.h vinagre-2.29.1/plugin-loaders/c/vinagre-plugin-loader-c.h --- vinagre-2.26.1/plugin-loaders/c/vinagre-plugin-loader-c.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugin-loaders/c/vinagre-plugin-loader-c.h 2009-07-27 12:59:28.000000000 +0100 @@ -0,0 +1,60 @@ +/* + * vinagre-plugin-loader-c.h + * This file is part of vinagre + * + * Copyright (C) 2008 - Jesse van den Kieboom + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __VINAGRE_PLUGIN_LOADER_C_H__ +#define __VINAGRE_PLUGIN_LOADER_C_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_PLUGIN_LOADER_C (vinagre_plugin_loader_c_get_type ()) +#define VINAGRE_PLUGIN_LOADER_C(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderC)) +#define VINAGRE_PLUGIN_LOADER_C_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderC const)) +#define VINAGRE_PLUGIN_LOADER_C_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderCClass)) +#define VINAGRE_IS_PLUGIN_LOADER_C(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_PLUGIN_LOADER_C)) +#define VINAGRE_IS_PLUGIN_LOADER_C_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_PLUGIN_LOADER_C)) +#define VINAGRE_PLUGIN_LOADER_C_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_PLUGIN_LOADER_C, VinagrePluginLoaderCClass)) + +typedef struct _VinagrePluginLoaderC VinagrePluginLoaderC; +typedef struct _VinagrePluginLoaderCClass VinagrePluginLoaderCClass; +typedef struct _VinagrePluginLoaderCPrivate VinagrePluginLoaderCPrivate; + +struct _VinagrePluginLoaderC { + GObject parent; + + VinagrePluginLoaderCPrivate *priv; +}; + +struct _VinagrePluginLoaderCClass { + GObjectClass parent_class; +}; + +GType vinagre_plugin_loader_c_get_type (void) G_GNUC_CONST; +VinagrePluginLoaderC *vinagre_plugin_loader_c_new(void); + +/* All the loaders must implement this function */ +G_MODULE_EXPORT GType register_vinagre_plugin_loader (GTypeModule * module); + +G_END_DECLS + +#endif /* __VINAGRE_PLUGIN_LOADER_C_H__ */ diff -Nru vinagre-2.26.1/plugin-loaders/Makefile.am vinagre-2.29.1/plugin-loaders/Makefile.am --- vinagre-2.26.1/plugin-loaders/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugin-loaders/Makefile.am 2009-07-27 12:59:28.000000000 +0100 @@ -0,0 +1,3 @@ +SUBDIRS = c + +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/plugin-loaders/Makefile.in vinagre-2.29.1/plugin-loaders/Makefile.in --- vinagre-2.26.1/plugin-loaders/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugin-loaders/Makefile.in 2009-10-26 13:35:25.000000000 +0000 @@ -0,0 +1,616 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = plugin-loaders +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPLET_CFLAGS = @APPLET_CFLAGS@ +APPLET_LIBS = @APPLET_LIBS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVAHI_CFLAGS = @AVAHI_CFLAGS@ +AVAHI_LIBS = @AVAHI_LIBS@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +REBUILD = @REBUILD@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ +STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ +VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ +VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WARN_CFLAGS = @WARN_CFLAGS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = c +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugin-loaders/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugin-loaders/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru vinagre-2.26.1/plugins/Makefile.am vinagre-2.29.1/plugins/Makefile.am --- vinagre-2.26.1/plugins/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/Makefile.am 2009-08-01 19:01:08.000000000 +0100 @@ -0,0 +1,12 @@ +DIST_SUBDIRS = \ + vnc \ + ssh + +SUBDIRS = \ + vnc + +if SSH +SUBDIRS += ssh +endif + +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/plugins/Makefile.in vinagre-2.29.1/plugins/Makefile.in --- vinagre-2.26.1/plugins/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/Makefile.in 2009-10-26 13:35:26.000000000 +0000 @@ -0,0 +1,620 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@SSH_TRUE@am__append_1 = ssh +subdir = plugins +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPLET_CFLAGS = @APPLET_CFLAGS@ +APPLET_LIBS = @APPLET_LIBS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVAHI_CFLAGS = @AVAHI_CFLAGS@ +AVAHI_LIBS = @AVAHI_LIBS@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +REBUILD = @REBUILD@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ +STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ +VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ +VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WARN_CFLAGS = @WARN_CFLAGS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +DIST_SUBDIRS = \ + vnc \ + ssh + +SUBDIRS = vnc $(am__append_1) +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru vinagre-2.26.1/plugins/ssh/Makefile.am vinagre-2.29.1/plugins/ssh/Makefile.am --- vinagre-2.26.1/plugins/ssh/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/ssh/Makefile.am 2009-08-01 19:01:08.000000000 +0100 @@ -0,0 +1,30 @@ +# ssh plugin +plugindir = $(VINAGRE_PLUGINS_LIBS_DIR) + +INCLUDES = \ + -I$(top_srcdir) \ + $(SSH_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) + +plugin_LTLIBRARIES = libssh.la + +libssh_la_SOURCES = \ + vinagre-ssh-plugin.h vinagre-ssh-plugin.c \ + vinagre-ssh-connection.h vinagre-ssh-connection.c \ + vinagre-ssh-tab.h vinagre-ssh-tab.c + +libssh_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) +libssh_la_LIBADD = $(SSH_LIBS) + +plugin_in_files = ssh.vinagre-plugin.desktop.in + +ssh.vinagre-plugin: ssh.vinagre-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +plugin_DATA = $(plugin_in_files:.vinagre-plugin.desktop.in=.vinagre-plugin) + +EXTRA_DIST = $(plugin_in_files) +CLEANFILES = $(plugin_DATA) +DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/plugins/ssh/Makefile.in vinagre-2.29.1/plugins/ssh/Makefile.in --- vinagre-2.26.1/plugins/ssh/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/ssh/Makefile.in 2009-10-26 13:35:26.000000000 +0000 @@ -0,0 +1,644 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = plugins/ssh +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +LTLIBRARIES = $(plugin_LTLIBRARIES) +am__DEPENDENCIES_1 = +libssh_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_libssh_la_OBJECTS = vinagre-ssh-plugin.lo vinagre-ssh-connection.lo \ + vinagre-ssh-tab.lo +libssh_la_OBJECTS = $(am_libssh_la_OBJECTS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +libssh_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libssh_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libssh_la_SOURCES) +DIST_SOURCES = $(libssh_la_SOURCES) +DATA = $(plugin_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPLET_CFLAGS = @APPLET_CFLAGS@ +APPLET_LIBS = @APPLET_LIBS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVAHI_CFLAGS = @AVAHI_CFLAGS@ +AVAHI_LIBS = @AVAHI_LIBS@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +REBUILD = @REBUILD@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ +STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ +VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ +VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WARN_CFLAGS = @WARN_CFLAGS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# ssh plugin +plugindir = $(VINAGRE_PLUGINS_LIBS_DIR) +INCLUDES = \ + -I$(top_srcdir) \ + $(SSH_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) + +plugin_LTLIBRARIES = libssh.la +libssh_la_SOURCES = \ + vinagre-ssh-plugin.h vinagre-ssh-plugin.c \ + vinagre-ssh-connection.h vinagre-ssh-connection.c \ + vinagre-ssh-tab.h vinagre-ssh-tab.c + +libssh_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) +libssh_la_LIBADD = $(SSH_LIBS) +plugin_in_files = ssh.vinagre-plugin.desktop.in +plugin_DATA = $(plugin_in_files:.vinagre-plugin.desktop.in=.vinagre-plugin) +EXTRA_DIST = $(plugin_in_files) +CLEANFILES = $(plugin_DATA) +DISTCLEANFILES = $(plugin_DATA) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/ssh/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/ssh/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libssh.la: $(libssh_la_OBJECTS) $(libssh_la_DEPENDENCIES) + $(AM_V_CCLD)$(libssh_la_LINK) -rpath $(plugindir) $(libssh_la_OBJECTS) $(libssh_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-ssh-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-ssh-plugin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-ssh-tab.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \ + done + +uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(DATA) +installdirs: + for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginDATA install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginDATA \ + install-pluginLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +ssh.vinagre-plugin: ssh.vinagre-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru vinagre-2.26.1/plugins/ssh/ssh.vinagre-plugin.desktop.in vinagre-2.29.1/plugins/ssh/ssh.vinagre-plugin.desktop.in --- vinagre-2.26.1/plugins/ssh/ssh.vinagre-plugin.desktop.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/ssh/ssh.vinagre-plugin.desktop.in 2009-08-01 19:01:08.000000000 +0100 @@ -0,0 +1,11 @@ +[Vinagre Plugin] +Module=ssh +IAge=1 +_Name=SSH +_Description=SSH support +Authors=Jonh Wendell +Copyright=Copyright © 2009 Jonh Wendell +Website=http://www.bani.com.br +Version=1.0 +Engine=1 +Icon=utilities-terminal diff -Nru vinagre-2.26.1/plugins/ssh/vinagre-ssh-connection.c vinagre-2.29.1/plugins/ssh/vinagre-ssh-connection.c --- vinagre-2.26.1/plugins/ssh/vinagre-ssh-connection.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/ssh/vinagre-ssh-connection.c 2009-08-01 19:01:08.000000000 +0100 @@ -0,0 +1,78 @@ +/* + * vinagre-ssh-connection.c + * Child class of abstract VinagreConnection, specific to SSH protocol + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include "vinagre-ssh-connection.h" + +struct _VinagreSshConnectionPrivate +{ + gint dummy; +}; + +#define VINAGRE_SSH_CONNECTION_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VINAGRE_TYPE_SSH_CONNECTION, VinagreSshConnectionPrivate)) +G_DEFINE_TYPE (VinagreSshConnection, vinagre_ssh_connection, VINAGRE_TYPE_CONNECTION); + +static void +vinagre_ssh_connection_init (VinagreSshConnection *conn) +{ + conn->priv = G_TYPE_INSTANCE_GET_PRIVATE (conn, VINAGRE_TYPE_SSH_CONNECTION, VinagreSshConnectionPrivate); +} + +static void +vinagre_ssh_connection_constructed (GObject *object) +{ + vinagre_connection_set_protocol (VINAGRE_CONNECTION (object), "ssh"); +} + +static void +ssh_fill_writer (VinagreConnection *conn, xmlTextWriter *writer) +{ + VINAGRE_CONNECTION_CLASS (vinagre_ssh_connection_parent_class)->impl_fill_writer (conn, writer); +} + +static void +ssh_parse_item (VinagreConnection *conn, xmlNode *root) +{ + VINAGRE_CONNECTION_CLASS (vinagre_ssh_connection_parent_class)->impl_parse_item (conn, root); +} + +static void +vinagre_ssh_connection_class_init (VinagreSshConnectionClass *klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS (klass); + VinagreConnectionClass* parent_class = VINAGRE_CONNECTION_CLASS (klass); + + g_type_class_add_private (klass, sizeof (VinagreSshConnectionPrivate)); + + object_class->constructed = vinagre_ssh_connection_constructed; + + parent_class->impl_fill_writer = ssh_fill_writer; + parent_class->impl_parse_item = ssh_parse_item; +} + +VinagreConnection * +vinagre_ssh_connection_new (void) +{ + return VINAGRE_CONNECTION (g_object_new (VINAGRE_TYPE_SSH_CONNECTION, NULL)); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/ssh/vinagre-ssh-connection.h vinagre-2.29.1/plugins/ssh/vinagre-ssh-connection.h --- vinagre-2.26.1/plugins/ssh/vinagre-ssh-connection.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/ssh/vinagre-ssh-connection.h 2009-08-01 19:01:08.000000000 +0100 @@ -0,0 +1,59 @@ +/* + * vinagre-ssh-connection.h + * Child class of abstract VinagreConnection, specific to SSH protocol + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_SSH_CONNECTION_H__ +#define __VINAGRE_SSH_CONNECTION_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_SSH_CONNECTION (vinagre_ssh_connection_get_type ()) +#define VINAGRE_SSH_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_SSH_CONNECTION, VinagreSshConnection)) +#define VINAGRE_SSH_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_SSH_CONNECTION, VinagreSshConnectionClass)) +#define VINAGRE_IS_SSH_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_SSH_CONNECTION)) +#define VINAGRE_IS_SSH_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_SSH_CONNECTION)) +#define VINAGRE_SSH_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_SSH_CONNECTION, VinagreSshConnectionClass)) + +typedef struct _VinagreSshConnectionClass VinagreSshConnectionClass; +typedef struct _VinagreSshConnection VinagreSshConnection; +typedef struct _VinagreSshConnectionPrivate VinagreSshConnectionPrivate; + +struct _VinagreSshConnectionClass +{ + VinagreConnectionClass parent_class; +}; + +struct _VinagreSshConnection +{ + VinagreConnection parent_instance; + VinagreSshConnectionPrivate *priv; +}; + + +GType vinagre_ssh_connection_get_type (void) G_GNUC_CONST; + +VinagreConnection* vinagre_ssh_connection_new (void); + +G_END_DECLS + +#endif /* __VINAGRE_SSH_CONNECTION_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/ssh/vinagre-ssh-plugin.c vinagre-2.29.1/plugins/ssh/vinagre-ssh-plugin.c --- vinagre-2.26.1/plugins/ssh/vinagre-ssh-plugin.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/ssh/vinagre-ssh-plugin.c 2009-08-01 19:01:08.000000000 +0100 @@ -0,0 +1,136 @@ +/* + * vinagre-ssh-plugin.c + * This file is part of vinagre + * + * Copyright (C) 2009 Jonh Wendell + * + * vinagre-ssh-plugin.c 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. + * + * vinagre-ssh-plugin.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include + +#include "vinagre-ssh-plugin.h" +#include "vinagre-ssh-connection.h" +#include "vinagre-ssh-tab.h" + +#define VINAGRE_SSH_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_SSH_PLUGIN, VinagreSshPluginPrivate)) + +VINAGRE_PLUGIN_REGISTER_TYPE(VinagreSshPlugin, vinagre_ssh_plugin) + +static void +impl_activate (VinagrePlugin *plugin, + VinagreWindow *window) +{ + vinagre_debug_message (DEBUG_PLUGINS, "VinagreSshPlugin Activate"); +} + +static void +impl_deactivate (VinagrePlugin *plugin, + VinagreWindow *window) +{ + vinagre_debug_message (DEBUG_PLUGINS, "VinagreSshPlugin Deactivate"); +} + +static void +impl_update_ui (VinagrePlugin *plugin, + VinagreWindow *window) +{ + vinagre_debug_message (DEBUG_PLUGINS, "VinagreSshPlugin Update UI"); +} + +static const gchar * +impl_get_protocol (VinagrePlugin *plugin) +{ + return "ssh"; +} + +static gchar ** +impl_get_public_description (VinagrePlugin *plugin) +{ + gchar **result = g_new (gchar *, 3); + + result[0] = g_strdup (_("SSH")); + /* Translators: This is a description of the SSH protocol. It appears at Connect dialog. */ + result[1] = g_strdup (_("Access Unix/Linux terminals")); + result[2] = NULL; + + return result; +} + +static const gchar * +impl_get_mdns_service (VinagrePlugin *plugin) +{ + return "_ssh._tcp"; +} + +static VinagreConnection * +impl_new_connection (VinagrePlugin *plugin) +{ + return vinagre_ssh_connection_new (); +} + +static GtkWidget * +impl_new_tab (VinagrePlugin *plugin, + VinagreConnection *conn, + VinagreWindow *window) +{ + return vinagre_ssh_tab_new (conn, window); +} + +static gint +impl_get_default_port (VinagrePlugin *plugin) +{ + return 22; +} + +static void +vinagre_ssh_plugin_init (VinagreSshPlugin *plugin) +{ + vinagre_debug_message (DEBUG_PLUGINS, "VinagreSshPlugin initializing"); +} + +static void +vinagre_ssh_plugin_finalize (GObject *object) +{ + vinagre_debug_message (DEBUG_PLUGINS, "VinagreSshPlugin finalizing"); + + G_OBJECT_CLASS (vinagre_ssh_plugin_parent_class)->finalize (object); +} + +static void +vinagre_ssh_plugin_class_init (VinagreSshPluginClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + VinagrePluginClass *plugin_class = VINAGRE_PLUGIN_CLASS (klass); + + object_class->finalize = vinagre_ssh_plugin_finalize; + + plugin_class->activate = impl_activate; + plugin_class->deactivate = impl_deactivate; + plugin_class->update_ui = impl_update_ui; + plugin_class->get_protocol = impl_get_protocol; + plugin_class->get_public_description = impl_get_public_description; + plugin_class->new_connection = impl_new_connection; + plugin_class->get_mdns_service = impl_get_mdns_service; + plugin_class->new_tab = impl_new_tab; + plugin_class->get_default_port = impl_get_default_port; +} +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/ssh/vinagre-ssh-plugin.h vinagre-2.29.1/plugins/ssh/vinagre-ssh-plugin.h --- vinagre-2.26.1/plugins/ssh/vinagre-ssh-plugin.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/ssh/vinagre-ssh-plugin.h 2009-08-01 19:01:08.000000000 +0100 @@ -0,0 +1,74 @@ +/* + * vinagre-ssh-plugin.h + * This file is part of vinagre + * + * Copyright (C) 2009 Jonh Wendell + * + * vinagre-ssh-plugin.h 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. + * + * vinagre-ssh-plugin.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_SSH_PLUGIN_H__ +#define __VINAGRE_SSH_PLUGIN_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +/* + * Type checking and casting macros + */ +#define VINAGRE_TYPE_SSH_PLUGIN (vinagre_ssh_plugin_get_type ()) +#define VINAGRE_SSH_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), VINAGRE_TYPE_SSH_PLUGIN, VinagreSshPlugin)) +#define VINAGRE_SSH_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), VINAGRE_TYPE_SSH_PLUGIN, VinagreSshPluginClass)) +#define VINAGRE_IS_SSH_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), VINAGRE_TYPE_SSH_PLUGIN)) +#define VINAGRE_IS_SSH_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), VINAGRE_TYPE_SSH_PLUGIN)) +#define VINAGRE_SSH_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), VINAGRE_TYPE_SSH_PLUGIN, VinagreSshPluginClass)) + +/* Private structure type */ +typedef struct _VinagreSshPluginPrivate VinagreSshPluginPrivate; + +/* + * Main object structure + */ +typedef struct _VinagreSshPlugin VinagreSshPlugin; + +struct _VinagreSshPlugin +{ + VinagrePlugin parent_instance; +}; + +/* + * Class definition + */ +typedef struct _VinagreSshPluginClass VinagreSshPluginClass; + +struct _VinagreSshPluginClass +{ + VinagrePluginClass parent_class; +}; + +/* + * Public methods + */ +GType vinagre_ssh_plugin_get_type (void) G_GNUC_CONST; + +/* All the plugins must implement this function */ +G_MODULE_EXPORT GType register_vinagre_plugin (GTypeModule *module); + +G_END_DECLS + +#endif /* __VINAGRE_SSH_PLUGIN_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/ssh/vinagre-ssh-tab.c vinagre-2.29.1/plugins/ssh/vinagre-ssh-tab.c --- vinagre-2.26.1/plugins/ssh/vinagre-ssh-tab.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/ssh/vinagre-ssh-tab.c 2009-08-13 15:53:37.000000000 +0100 @@ -0,0 +1,147 @@ +/* + * vinagre-ssh-tab.c + * SSH Implementation for VinagreSshTab widget + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include + +#include +#include + +#include "vinagre-ssh-tab.h" +#include "vinagre-ssh-connection.h" + +#define VINAGRE_SSH_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_SSH_TAB, VinagreSshTabPrivate)) + +struct _VinagreSshTabPrivate +{ + GtkWidget *vte; +}; + +G_DEFINE_TYPE (VinagreSshTab, vinagre_ssh_tab, VINAGRE_TYPE_TAB) + +static gchar * +ssh_tab_get_tooltip (VinagreTab *tab) +{ + VinagreConnection *conn = vinagre_tab_get_conn (tab); + + return g_markup_printf_escaped ( + "%s %s\n" + "%s %d", + _("Host:"), vinagre_connection_get_host (conn), + _("Port:"), vinagre_connection_get_port (conn)); +} + +static GdkPixbuf * +ssh_tab_get_screenshot (VinagreTab *tab) +{ + return NULL; +} + +static gboolean +emit_delayed_signal (GObject *object) +{ + VinagreSshTab *ssh_tab = VINAGRE_SSH_TAB (object); + + g_signal_emit_by_name (object, "tab-initialized"); + gtk_widget_grab_focus (ssh_tab->priv->vte); + return FALSE; +} + +static void +vinagre_ssh_tab_constructed (GObject *object) +{ + gchar **arg; + VinagreSshTab *ssh_tab = VINAGRE_SSH_TAB (object); + VinagreTab *tab = VINAGRE_TAB (object); + + if (G_OBJECT_CLASS (vinagre_ssh_tab_parent_class)->constructed) + G_OBJECT_CLASS (vinagre_ssh_tab_parent_class)->constructed (object); + + arg = g_new (gchar *, 5); + arg[0] = g_strdup ("ssh"); + arg[1] = g_strdup (vinagre_connection_get_host (vinagre_tab_get_conn (tab))); + arg[2] = g_strdup ("-p"); + arg[3] = g_strdup_printf ("%d", vinagre_connection_get_port (vinagre_tab_get_conn (tab))); + arg[4] = NULL; + + vte_terminal_fork_command (VTE_TERMINAL (ssh_tab->priv->vte), + "ssh", + arg, + NULL, + NULL, + FALSE, + FALSE, + FALSE); + g_strfreev (arg); + gtk_widget_show_all (GTK_WIDGET (ssh_tab)); + + vinagre_tab_add_recent_used (tab); + vinagre_tab_set_state (tab, VINAGRE_TAB_STATE_CONNECTED); + g_idle_add ((GSourceFunc)emit_delayed_signal, object); +} + +static void +vinagre_ssh_tab_class_init (VinagreSshTabClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + VinagreTabClass* tab_class = VINAGRE_TAB_CLASS (klass); + + object_class->constructed = vinagre_ssh_tab_constructed; + + tab_class->impl_get_tooltip = ssh_tab_get_tooltip; + tab_class->impl_get_screenshot = ssh_tab_get_screenshot; + + g_type_class_add_private (object_class, sizeof (VinagreSshTabPrivate)); +} + +static void +ssh_disconnected_cb (VteTerminal *ssh, VinagreSshTab *tab) +{ + g_signal_emit_by_name (G_OBJECT (tab), "tab-disconnected"); +} + +static void +vinagre_ssh_tab_init (VinagreSshTab *ssh_tab) +{ + ssh_tab->priv = VINAGRE_SSH_TAB_GET_PRIVATE (ssh_tab); + + /* Create the ssh widget */ + ssh_tab->priv->vte = vte_terminal_new (); + vinagre_tab_add_view (VINAGRE_TAB (ssh_tab), ssh_tab->priv->vte); + + g_signal_connect (ssh_tab->priv->vte, + "child-exited", + G_CALLBACK (ssh_disconnected_cb), + ssh_tab); +} + +GtkWidget * +vinagre_ssh_tab_new (VinagreConnection *conn, + VinagreWindow *window) +{ + return GTK_WIDGET (g_object_new (VINAGRE_TYPE_SSH_TAB, + "conn", conn, + "window", window, + NULL)); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/ssh/vinagre-ssh-tab.h vinagre-2.29.1/plugins/ssh/vinagre-ssh-tab.h --- vinagre-2.26.1/plugins/ssh/vinagre-ssh-tab.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/ssh/vinagre-ssh-tab.h 2009-08-01 19:01:08.000000000 +0100 @@ -0,0 +1,61 @@ +/* + * vinagre-ssh-tab.h + * SSH Tab + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_SSH_TAB_H__ +#define __VINAGRE_SSH_TAB_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_SSH_TAB (vinagre_ssh_tab_get_type()) +#define VINAGRE_SSH_TAB(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_SSH_TAB, VinagreSshTab)) +#define VINAGRE_SSH_TAB_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_SSH_TAB, VinagreSshTab const)) +#define VINAGRE_SSH_TAB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_SSH_TAB, VinagreSshTabClass)) +#define VINAGRE_IS_SSH_TAB(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_SSH_TAB)) +#define VINAGRE_IS_SSH_TAB_CLASS(klass)...(G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_SSH_TAB)) +#define VINAGRE_SSH_TAB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_SSH_TAB, VinagreSshTabClass)) + +typedef struct _VinagreSshTabPrivate VinagreSshTabPrivate; +typedef struct _VinagreSshTab VinagreSshTab; +typedef struct _VinagreSshTabClass VinagreSshTabClass; + + +struct _VinagreSshTab +{ + VinagreTab tab; + VinagreSshTabPrivate *priv; +}; + +struct _VinagreSshTabClass +{ + VinagreTabClass parent_class; +}; + +GType vinagre_ssh_tab_get_type (void) G_GNUC_CONST; + +GtkWidget * vinagre_ssh_tab_new (VinagreConnection *conn, + VinagreWindow *window); + +G_END_DECLS + +#endif /* __VINAGRE_SSH_TAB_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/Makefile.am vinagre-2.29.1/plugins/vnc/Makefile.am --- vinagre-2.26.1/plugins/vnc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/Makefile.am 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,37 @@ +# vnc plugin +plugindir = $(VINAGRE_PLUGINS_LIBS_DIR) + +INCLUDES = \ + -I$(top_srcdir) \ + $(VNC_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) + +plugin_LTLIBRARIES = libvnc.la + +libvnc_la_SOURCES = \ + vinagre-vnc-plugin.h vinagre-vnc-plugin.c \ + vinagre-vnc-connection.h vinagre-vnc-connection.c \ + vinagre-vnc-tab.h vinagre-vnc-tab.c \ + vinagre-vnc-listener.h vinagre-vnc-listener.c \ + vinagre-vnc-listener-dialog.h vinagre-vnc-listener-dialog.c + +libvnc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) +libvnc_la_LIBADD = $(VNC_LIBS) + +uidir = $(VINAGRE_PLUGINS_DATA_DIR)/vnc +ui_DATA = vnc.ui + +plugin_in_files = vnc.vinagre-plugin.desktop.in + +vnc.vinagre-plugin: vnc.vinagre-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +plugin_DATA = $(plugin_in_files:.vinagre-plugin.desktop.in=.vinagre-plugin) + +EXTRA_DIST = $(ui_DATA) $(plugin_in_files) + +CLEANFILES = $(plugin_DATA) +DISTCLEANFILES = $(plugin_DATA) + + +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/plugins/vnc/Makefile.in vinagre-2.29.1/plugins/vnc/Makefile.in --- vinagre-2.26.1/plugins/vnc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/Makefile.in 2009-10-26 13:35:26.000000000 +0000 @@ -0,0 +1,675 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = plugins/vnc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" \ + "$(DESTDIR)$(uidir)" +LTLIBRARIES = $(plugin_LTLIBRARIES) +am__DEPENDENCIES_1 = +libvnc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_libvnc_la_OBJECTS = vinagre-vnc-plugin.lo vinagre-vnc-connection.lo \ + vinagre-vnc-tab.lo vinagre-vnc-listener.lo \ + vinagre-vnc-listener-dialog.lo +libvnc_la_OBJECTS = $(am_libvnc_la_OBJECTS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +libvnc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libvnc_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libvnc_la_SOURCES) +DIST_SOURCES = $(libvnc_la_SOURCES) +DATA = $(plugin_DATA) $(ui_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPLET_CFLAGS = @APPLET_CFLAGS@ +APPLET_LIBS = @APPLET_LIBS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVAHI_CFLAGS = @AVAHI_CFLAGS@ +AVAHI_LIBS = @AVAHI_LIBS@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +REBUILD = @REBUILD@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ +STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ +VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ +VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WARN_CFLAGS = @WARN_CFLAGS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# vnc plugin +plugindir = $(VINAGRE_PLUGINS_LIBS_DIR) +INCLUDES = \ + -I$(top_srcdir) \ + $(VNC_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) + +plugin_LTLIBRARIES = libvnc.la +libvnc_la_SOURCES = \ + vinagre-vnc-plugin.h vinagre-vnc-plugin.c \ + vinagre-vnc-connection.h vinagre-vnc-connection.c \ + vinagre-vnc-tab.h vinagre-vnc-tab.c \ + vinagre-vnc-listener.h vinagre-vnc-listener.c \ + vinagre-vnc-listener-dialog.h vinagre-vnc-listener-dialog.c + +libvnc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) +libvnc_la_LIBADD = $(VNC_LIBS) +uidir = $(VINAGRE_PLUGINS_DATA_DIR)/vnc +ui_DATA = vnc.ui +plugin_in_files = vnc.vinagre-plugin.desktop.in +plugin_DATA = $(plugin_in_files:.vinagre-plugin.desktop.in=.vinagre-plugin) +EXTRA_DIST = $(ui_DATA) $(plugin_in_files) +CLEANFILES = $(plugin_DATA) +DISTCLEANFILES = $(plugin_DATA) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/vnc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/vnc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ + } + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libvnc.la: $(libvnc_la_OBJECTS) $(libvnc_la_DEPENDENCIES) + $(AM_V_CCLD)$(libvnc_la_LINK) -rpath $(plugindir) $(libvnc_la_OBJECTS) $(libvnc_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-vnc-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-vnc-listener-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-vnc-listener.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-vnc-plugin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-vnc-tab.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \ + done + +uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(plugindir)" && rm -f $$files +install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) + test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ + done + +uninstall-uiDATA: + @$(NORMAL_UNINSTALL) + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(uidir)" && rm -f $$files + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(DATA) +installdirs: + for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(uidir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-pluginDATA install-pluginLTLIBRARIES \ + install-uiDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ + uninstall-uiDATA + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginDATA \ + install-pluginLTLIBRARIES install-ps install-ps-am \ + install-strip install-uiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES \ + uninstall-uiDATA + + +vnc.vinagre-plugin: vnc.vinagre-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-connection.c vinagre-2.29.1/plugins/vnc/vinagre-vnc-connection.c --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-connection.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-connection.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,511 @@ +/* + * vinagre-vnc-connection.c + * Child class of abstract VinagreConnection, specific to VNC protocol + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "vinagre-vnc-connection.h" + +struct _VinagreVncConnectionPrivate +{ + gchar *desktop_name; + gboolean view_only; + gboolean scaling; + gint shared; + gint fd; + gint depth_profile; + gboolean lossy_encoding; +}; + +enum +{ + PROP_0, + PROP_DESKTOP_NAME, + PROP_VIEW_ONLY, + PROP_SCALING, + PROP_SHARED, + PROP_FD, + PROP_DEPTH_PROFILE, + PROP_LOSSY_ENCODING +}; + +#define VINAGRE_VNC_CONNECTION_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnectionPrivate)) +G_DEFINE_TYPE (VinagreVncConnection, vinagre_vnc_connection, VINAGRE_TYPE_CONNECTION); + +static void +vinagre_vnc_connection_init (VinagreVncConnection *conn) +{ + conn->priv = G_TYPE_INSTANCE_GET_PRIVATE (conn, VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnectionPrivate); + + conn->priv->desktop_name = NULL; + conn->priv->view_only = FALSE; + conn->priv->scaling = FALSE; + conn->priv->shared = -1; + conn->priv->fd = 0; + conn->priv->depth_profile = 0; + conn->priv->lossy_encoding = FALSE; +} + +static void +vinagre_vnc_connection_constructed (GObject *object) +{ + vinagre_connection_set_protocol (VINAGRE_CONNECTION (object), "vnc"); +} + +static void +vinagre_vnc_connection_finalize (GObject *object) +{ + VinagreVncConnection *conn = VINAGRE_VNC_CONNECTION (object); + + g_free (conn->priv->desktop_name); + + G_OBJECT_CLASS (vinagre_vnc_connection_parent_class)->finalize (object); +} + +static void +vinagre_vnc_connection_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +{ + VinagreVncConnection *conn; + + g_return_if_fail (VINAGRE_IS_VNC_CONNECTION (object)); + + conn = VINAGRE_VNC_CONNECTION (object); + + switch (prop_id) + { + case PROP_DESKTOP_NAME: + vinagre_vnc_connection_set_desktop_name (conn, g_value_get_string (value)); + break; + + case PROP_VIEW_ONLY: + vinagre_vnc_connection_set_view_only (conn, g_value_get_boolean (value)); + break; + + case PROP_SCALING: + vinagre_vnc_connection_set_scaling (conn, g_value_get_boolean (value)); + break; + + case PROP_SHARED: + vinagre_vnc_connection_set_shared (conn, g_value_get_int (value)); + break; + + case PROP_FD: + vinagre_vnc_connection_set_fd (conn, g_value_get_int (value)); + break; + + case PROP_DEPTH_PROFILE: + vinagre_vnc_connection_set_depth_profile (conn, g_value_get_int (value)); + break; + + case PROP_LOSSY_ENCODING: + vinagre_vnc_connection_set_lossy_encoding (conn, g_value_get_boolean (value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_vnc_connection_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + VinagreVncConnection *conn; + + g_return_if_fail (VINAGRE_IS_VNC_CONNECTION (object)); + + conn = VINAGRE_VNC_CONNECTION (object); + + switch (prop_id) + { + case PROP_DESKTOP_NAME: + g_value_set_string (value, conn->priv->desktop_name); + break; + + case PROP_VIEW_ONLY: + g_value_set_boolean (value, conn->priv->view_only); + break; + + case PROP_SCALING: + g_value_set_boolean (value, conn->priv->scaling); + break; + + case PROP_SHARED: + g_value_set_int (value, conn->priv->shared); + break; + + case PROP_FD: + g_value_set_int (value, conn->priv->fd); + break; + + case PROP_DEPTH_PROFILE: + g_value_set_int (value, conn->priv->depth_profile); + break; + + case PROP_LOSSY_ENCODING: + g_value_set_boolean (value, conn->priv->lossy_encoding); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vnc_fill_writer (VinagreConnection *conn, xmlTextWriter *writer) +{ + VinagreVncConnection *vnc_conn = VINAGRE_VNC_CONNECTION (conn); + VINAGRE_CONNECTION_CLASS (vinagre_vnc_connection_parent_class)->impl_fill_writer (conn, writer); + + xmlTextWriterWriteFormatElement (writer, (const xmlChar *)"view_only", "%d", vnc_conn->priv->view_only); + xmlTextWriterWriteFormatElement (writer, (const xmlChar *)"scaling", "%d", vnc_conn->priv->scaling); + xmlTextWriterWriteFormatElement (writer, (const xmlChar *)"depth_profile", "%d", vnc_conn->priv->depth_profile); + xmlTextWriterWriteFormatElement (writer, (const xmlChar *)"lossy_encoding", "%d", vnc_conn->priv->lossy_encoding); +} + +static void +vnc_parse_item (VinagreConnection *conn, xmlNode *root) +{ + xmlNode *curr; + xmlChar *s_value; + VinagreVncConnection *vnc_conn = VINAGRE_VNC_CONNECTION (conn); + + VINAGRE_CONNECTION_CLASS (vinagre_vnc_connection_parent_class)->impl_parse_item (conn, root); + + for (curr = root->children; curr; curr = curr->next) + { + s_value = xmlNodeGetContent (curr); + + if (!xmlStrcmp(curr->name, (const xmlChar *)"view_only")) + { + vinagre_vnc_connection_set_view_only (vnc_conn, vinagre_utils_parse_boolean ((const gchar *)s_value)); + } + else if (!xmlStrcmp(curr->name, (const xmlChar *)"scaling")) + { + if (!scaling_command_line) + vinagre_vnc_connection_set_scaling (vnc_conn, vinagre_utils_parse_boolean ((const gchar *)s_value)); + } + else if (!xmlStrcmp(curr->name, (const xmlChar *)"depth_profile")) + { + vinagre_vnc_connection_set_depth_profile (vnc_conn, atoi((const char *)s_value)); + } + else if (!xmlStrcmp(curr->name, (const xmlChar *)"lossy_encoding")) + { + vinagre_vnc_connection_set_lossy_encoding (vnc_conn, vinagre_utils_parse_boolean ((const gchar *)s_value)); + } + + xmlFree (s_value); + } +} + +static gchar * +vnc_get_best_name (VinagreConnection *conn) +{ + VinagreVncConnection *vnc_conn = VINAGRE_VNC_CONNECTION (conn); + + if (vinagre_connection_get_name (conn)) + return g_strdup (vinagre_connection_get_name (conn)); + + if (vnc_conn->priv->desktop_name) + return g_strdup (vnc_conn->priv->desktop_name); + + if (vinagre_connection_get_host (conn)) + return vinagre_connection_get_string_rep (conn, FALSE); + + return NULL; +} + +static void +vnc_fill_conn_from_file (VinagreConnection *conn, GKeyFile *file) +{ + gint shared; + GError *e = NULL; + + shared = g_key_file_get_integer (file, "options", "shared", &e); + if (e) + { + g_error_free (e); + return; + } + else + if (shared == 0 || shared == 1) + vinagre_vnc_connection_set_shared (VINAGRE_VNC_CONNECTION (conn), shared); + else + g_message (_("Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it."), shared); +} + +static void +vnc_parse_options_widget (VinagreConnection *conn, GtkWidget *widget) +{ + GtkWidget *view_only, *scaling, *depth_combo, *lossy; + + view_only = g_object_get_data (G_OBJECT (widget), "view_only"); + scaling = g_object_get_data (G_OBJECT (widget), "scaling"); + depth_combo = g_object_get_data (G_OBJECT (widget), "depth_combo"); + lossy = g_object_get_data (G_OBJECT (widget), "lossy"); + if (!view_only || !scaling || !depth_combo || !lossy) + { + g_warning ("Wrong widget passed to vnc_parse_options_widget()"); + return; + } + + g_object_set (conn, + "view-only", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view_only)), + "scaling", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scaling)), + "depth-profile", gtk_combo_box_get_active (GTK_COMBO_BOX (depth_combo)), + "lossy-encoding", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lossy)), + NULL); +} + +static void +vinagre_vnc_connection_class_init (VinagreVncConnectionClass *klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS (klass); + VinagreConnectionClass* parent_class = VINAGRE_CONNECTION_CLASS (klass); + + g_type_class_add_private (klass, sizeof (VinagreVncConnectionPrivate)); + + object_class->finalize = vinagre_vnc_connection_finalize; + object_class->set_property = vinagre_vnc_connection_set_property; + object_class->get_property = vinagre_vnc_connection_get_property; + object_class->constructed = vinagre_vnc_connection_constructed; + + parent_class->impl_fill_writer = vnc_fill_writer; + parent_class->impl_parse_item = vnc_parse_item; + parent_class->impl_get_best_name = vnc_get_best_name; + parent_class->impl_fill_conn_from_file = vnc_fill_conn_from_file; + parent_class->impl_parse_options_widget = vnc_parse_options_widget; + + g_object_class_install_property (object_class, + PROP_DESKTOP_NAME, + g_param_spec_string ("desktop-name", + "desktop-name", + "name of this connection as reported by the server", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_VIEW_ONLY, + g_param_spec_boolean ("view-only", + "View-only connection", + "Whether this connection is a view-only one", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + g_object_class_install_property (object_class, + PROP_SCALING, + g_param_spec_boolean ("scaling", + "Use scaling", + "Whether to use scaling on this connection", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_SHARED, + g_param_spec_int ("shared", + "shared flag", + "if the server should allow more than one client connected", + -1, + 1, + -1, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_FD, + g_param_spec_int ("fd", + "file descriptor", + "the file descriptor for this connection", + 0, + G_MAXINT, + 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_DEPTH_PROFILE, + g_param_spec_int ("depth-profile", + "Depth Profile", + "The profile of depth color to be used in gtk-vnc widget", + 0, + 5, + 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_LOSSY_ENCODING, + g_param_spec_boolean ("lossy-encoding", + "Lossy encoding", + "Whether to use a lossy encoding", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + +} + +VinagreConnection * +vinagre_vnc_connection_new (void) +{ + return VINAGRE_CONNECTION (g_object_new (VINAGRE_TYPE_VNC_CONNECTION, NULL)); +} + +void +vinagre_vnc_connection_set_desktop_name (VinagreVncConnection *conn, + const gchar *desktop_name) +{ + g_return_if_fail (VINAGRE_IS_VNC_CONNECTION (conn)); + + g_free (conn->priv->desktop_name); + conn->priv->desktop_name = g_strdup (desktop_name); +} +const gchar * +vinagre_vnc_connection_get_desktop_name (VinagreVncConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_CONNECTION (conn), NULL); + + return conn->priv->desktop_name; +} + +void +vinagre_vnc_connection_set_shared (VinagreVncConnection *conn, + gint value) +{ + g_return_if_fail (VINAGRE_IS_VNC_CONNECTION (conn)); + g_return_if_fail (value >=-1 && value <=1); + + conn->priv->shared = value; +} +gint +vinagre_vnc_connection_get_shared (VinagreVncConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_CONNECTION (conn), -1); + + return conn->priv->shared; +} + +void +vinagre_vnc_connection_set_view_only (VinagreVncConnection *conn, + gboolean value) +{ + g_return_if_fail (VINAGRE_IS_VNC_CONNECTION (conn)); + + conn->priv->view_only = value; +} +gboolean +vinagre_vnc_connection_get_view_only (VinagreVncConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_CONNECTION (conn), FALSE); + + return conn->priv->view_only; +} + +void +vinagre_vnc_connection_set_scaling (VinagreVncConnection *conn, + gboolean value) +{ + g_return_if_fail (VINAGRE_IS_VNC_CONNECTION (conn)); + + conn->priv->scaling = value; +} +gboolean +vinagre_vnc_connection_get_scaling (VinagreVncConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_CONNECTION (conn), FALSE); + + return conn->priv->scaling; +} + +void +vinagre_vnc_connection_set_fd (VinagreVncConnection *conn, + gint value) +{ + g_return_if_fail (VINAGRE_IS_VNC_CONNECTION (conn)); + g_return_if_fail (value >= 0); + + conn->priv->fd = value; +} +gint +vinagre_vnc_connection_get_fd (VinagreVncConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_CONNECTION (conn), 0); + + return conn->priv->fd; +} + +void +vinagre_vnc_connection_set_depth_profile (VinagreVncConnection *conn, + gint value) +{ + g_return_if_fail (VINAGRE_IS_VNC_CONNECTION (conn)); + g_return_if_fail (value >= 0); + + conn->priv->depth_profile = value; +} +gint +vinagre_vnc_connection_get_depth_profile (VinagreVncConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_CONNECTION (conn), 0); + + return conn->priv->depth_profile; +} + +void +vinagre_vnc_connection_set_lossy_encoding (VinagreVncConnection *conn, + gboolean value) +{ + g_return_if_fail (VINAGRE_IS_VNC_CONNECTION (conn)); + + conn->priv->lossy_encoding = value; +} +gboolean +vinagre_vnc_connection_get_lossy_encoding (VinagreVncConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_CONNECTION (conn), FALSE); + + return conn->priv->lossy_encoding; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-connection.h vinagre-2.29.1/plugins/vnc/vinagre-vnc-connection.h --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-connection.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-connection.h 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,89 @@ +/* + * vinagre-vnc-connection.h + * Child class of abstract VinagreConnection, specific to VNC protocol + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_VNC_CONNECTION_H__ +#define __VINAGRE_VNC_CONNECTION_H__ + +#include + +G_BEGIN_DECLS + +gboolean scaling_command_line; + +#define VINAGRE_TYPE_VNC_CONNECTION (vinagre_vnc_connection_get_type ()) +#define VINAGRE_VNC_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnection)) +#define VINAGRE_VNC_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnectionClass)) +#define VINAGRE_IS_VNC_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_VNC_CONNECTION)) +#define VINAGRE_IS_VNC_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_VNC_CONNECTION)) +#define VINAGRE_VNC_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnectionClass)) + +typedef struct _VinagreVncConnectionClass VinagreVncConnectionClass; +typedef struct _VinagreVncConnection VinagreVncConnection; +typedef struct _VinagreVncConnectionPrivate VinagreVncConnectionPrivate; + +struct _VinagreVncConnectionClass +{ + VinagreConnectionClass parent_class; +}; + +struct _VinagreVncConnection +{ + VinagreConnection parent_instance; + VinagreVncConnectionPrivate *priv; +}; + + +GType vinagre_vnc_connection_get_type (void) G_GNUC_CONST; + +VinagreConnection* vinagre_vnc_connection_new (void); + +const gchar* vinagre_vnc_connection_get_desktop_name (VinagreVncConnection *conn); +void vinagre_vnc_connection_set_desktop_name (VinagreVncConnection *conn, + const gchar *desktop_name); + +gboolean vinagre_vnc_connection_get_view_only (VinagreVncConnection *conn); +void vinagre_vnc_connection_set_view_only (VinagreVncConnection *conn, + gboolean value); + +gboolean vinagre_vnc_connection_get_scaling (VinagreVncConnection *conn); +void vinagre_vnc_connection_set_scaling (VinagreVncConnection *conn, + gboolean value); + +gint vinagre_vnc_connection_get_shared (VinagreVncConnection *conn); +void vinagre_vnc_connection_set_shared (VinagreVncConnection *conn, + gint value); + +gint vinagre_vnc_connection_get_fd (VinagreVncConnection *conn); +void vinagre_vnc_connection_set_fd (VinagreVncConnection *conn, + gint value); + +gint vinagre_vnc_connection_get_depth_profile (VinagreVncConnection *conn); +void vinagre_vnc_connection_set_depth_profile (VinagreVncConnection *conn, + gint value); + +gboolean vinagre_vnc_connection_get_lossy_encoding (VinagreVncConnection *conn); +void vinagre_vnc_connection_set_lossy_encoding (VinagreVncConnection *conn, + gboolean enable); + +G_END_DECLS + +#endif /* __VINAGRE_VNC_CONNECTION_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-listener.c vinagre-2.29.1/plugins/vnc/vinagre-vnc-listener.c --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-listener.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-listener.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,265 @@ +/* + * vinagre-vnc-listener.c + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include "vinagre-vnc-listener.h" +#include "vinagre-vnc-connection.h" + +struct _VinagreVncListenerPrivate +{ + int server_sock; + GIOChannel *io; + gboolean listening; + guint io_uid; + gint port; +}; + +enum +{ + PROP_0, + PROP_LISTENING, + PROP_PORT +}; + +static VinagreVncListener *listener_singleton = NULL; + +#define VINAGRE_VNC_LISTENER_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VINAGRE_TYPE_VNC_LISTENER, VinagreVncListenerPrivate)) +G_DEFINE_TYPE (VinagreVncListener, vinagre_vnc_listener, G_TYPE_OBJECT); + +static void +vinagre_vnc_listener_init (VinagreVncListener *listener) +{ + listener->priv = G_TYPE_INSTANCE_GET_PRIVATE (listener, VINAGRE_TYPE_VNC_LISTENER, VinagreVncListenerPrivate); + + listener->priv->io = NULL; + listener->priv->server_sock = 0; + listener->priv->listening = FALSE; + listener->priv->io_uid = 0; + listener->priv->port = 0; +} + +static void +vinagre_vnc_listener_dispose (GObject *object) +{ + VinagreVncListener *listener = VINAGRE_VNC_LISTENER (object); + + vinagre_vnc_listener_stop (listener); + + G_OBJECT_CLASS (vinagre_vnc_listener_parent_class)->dispose (object); +} + +static void +vinagre_vnc_listener_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + VinagreVncListener *listener; + + g_return_if_fail (VINAGRE_IS_VNC_LISTENER (object)); + + listener = VINAGRE_VNC_LISTENER (object); + + switch (prop_id) + { + case PROP_LISTENING: + g_value_set_boolean (value, listener->priv->listening); + break; + + case PROP_PORT: + g_value_set_int (value, vinagre_vnc_listener_get_port (listener)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_vnc_listener_class_init (VinagreVncListenerClass *klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (VinagreVncListenerPrivate)); + + object_class->dispose = vinagre_vnc_listener_dispose; + object_class->get_property = vinagre_vnc_listener_get_property; + + g_object_class_install_property (object_class, + PROP_LISTENING, + g_param_spec_boolean ("listening", + "Listening", + "If we are listening for incoming (reverse) VNC connections", + FALSE, + G_PARAM_READABLE | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + g_object_class_install_property (object_class, + PROP_PORT, + g_param_spec_int ("port", + "Port", + "TCP port in which we are listening for reverse connections", + 5500, + 5600, + 5500, + G_PARAM_READABLE | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + +} + +VinagreVncListener * +vinagre_vnc_listener_get_default (void) +{ + if (G_UNLIKELY (!listener_singleton)) + listener_singleton = VINAGRE_VNC_LISTENER (g_object_new (VINAGRE_TYPE_VNC_LISTENER, NULL)); + + return listener_singleton; +} + +static gboolean +incoming (GIOChannel *source, GIOCondition condition, VinagreVncListener *listener) +{ + VinagreConnection *conn; + VinagreWindow *window; + int cl_sock; + struct sockaddr_in6 client_addr; + char client_name[INET6_ADDRSTRLEN]; + socklen_t client_addr_len = sizeof (client_addr); + + cl_sock = accept (listener->priv->server_sock, (struct sockaddr *) &client_addr, &client_addr_len); + if (cl_sock < 0) + g_error ("accept() failed"); + + window = vinagre_app_get_active_window (vinagre_app_get_default ()); + if (!window) + { + g_warning (_("Incoming VNC connection arrived but there is none active window")); + return TRUE; + } + + conn = vinagre_vnc_connection_new (); + vinagre_vnc_connection_set_fd (VINAGRE_VNC_CONNECTION (conn), cl_sock); + + if (inet_ntop (AF_INET6, &client_addr.sin6_addr.s6_addr, client_name, sizeof (client_name)) != NULL) + vinagre_connection_set_host (conn, client_name); + vinagre_connection_set_port (conn, ntohs (client_addr.sin6_port)); + + vinagre_cmd_direct_connect (conn, window); + + return TRUE; +} + +void +vinagre_vnc_listener_start (VinagreVncListener *listener) +{ + struct sockaddr_in6 server_addr; + int port; + + g_return_if_fail (VINAGRE_IS_VNC_LISTENER (listener)); + + if (listener->priv->listening) + return; + + listener->priv->server_sock = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP); + if (listener->priv->server_sock < 0) + g_error ("socket() failed"); + + memset (&server_addr, 0, sizeof (server_addr)); + server_addr.sin6_family = AF_INET6; + server_addr.sin6_addr = in6addr_any; + + for (port=5500; port<=5600; port++) + { + server_addr.sin6_port = htons (port); + + if (bind (listener->priv->server_sock, (struct sockaddr *) &server_addr, sizeof (server_addr)) == 0) + break; + } + if (port>5600) + g_error ("bind() failed"); + + if (listen (listener->priv->server_sock, 5) < 0) + g_error ("listen() failed"); + + listener->priv->io = g_io_channel_unix_new (listener->priv->server_sock); + listener->priv->io_uid = g_io_add_watch (listener->priv->io, G_IO_IN, (GIOFunc)incoming, listener); + + listener->priv->port = port; + listener->priv->listening = TRUE; + g_object_notify (G_OBJECT (listener), "listening"); +} + +void +vinagre_vnc_listener_stop (VinagreVncListener *listener) +{ + g_return_if_fail (VINAGRE_IS_VNC_LISTENER (listener)); + + if (!listener->priv->listening) + return; + + if (listener->priv->io) + { + g_source_remove (listener->priv->io_uid); + g_io_channel_unref (listener->priv->io); + listener->priv->io = NULL; + } + + if (listener->priv->server_sock > 0) + { + close (listener->priv->server_sock); + listener->priv->server_sock = 0; + } + + listener->priv->listening = FALSE; + g_object_notify (G_OBJECT (listener), "listening"); +} + +gboolean +vinagre_vnc_listener_is_listening (VinagreVncListener *listener) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_LISTENER (listener), FALSE); + + return listener->priv->listening; +} + +gint +vinagre_vnc_listener_get_port (VinagreVncListener *listener) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_LISTENER (listener), 0); + + return listener->priv->listening ? listener->priv->port : 0; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-listener-dialog.c vinagre-2.29.1/plugins/vnc/vinagre-vnc-listener-dialog.c --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-listener-dialog.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-listener-dialog.c 2009-10-26 12:26:20.000000000 +0000 @@ -0,0 +1,256 @@ +/* + * vinagre-vnc-listener-dialog.c + * This file is part of vinagre + * + * Copyright (C) 2009 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include "vinagre-vnc-listener-dialog.h" +#include "vinagre-vnc-listener.h" + +typedef struct +{ + GtkBuilder *xml; + GtkWidget *dialog; + GtkWidget *enable_reverse_check; + GtkWidget *always_enabled_check; + GtkWidget *port_label; + GtkWidget *connectivity_exp; + GtkTextBuffer *ip_buffer; +} VncListenDialog; + +static void +setup_ip_buffer (VncListenDialog *dialog) +{ + char buf[INET6_ADDRSTRLEN], *dup; + struct ifaddrs *myaddrs, *ifa; + void *sin; + GArray *ipv4, *ipv6; + GString *str; + int i; + + ipv4 = g_array_new (FALSE, TRUE, sizeof (char *)); + ipv6 = g_array_new (FALSE, TRUE, sizeof (char *)); + str = g_string_new (NULL); + + getifaddrs (&myaddrs); + for (ifa = myaddrs; ifa != NULL; ifa = ifa->ifa_next) + { + if (ifa->ifa_addr == NULL || ifa->ifa_name == NULL || (ifa->ifa_flags & IFF_UP) == 0 || strncmp (ifa->ifa_name, "lo", 2) == 0) + continue; + + switch (ifa->ifa_addr->sa_family) + { + case AF_INET: + sin = &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr; + inet_ntop (AF_INET, sin, buf, INET6_ADDRSTRLEN); + dup = g_strdup (buf); + g_array_append_val (ipv4, dup); + break; + + case AF_INET6: + sin = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr; + inet_ntop (AF_INET6, sin, buf, INET6_ADDRSTRLEN); + dup = g_strdup (buf); + g_array_append_val (ipv6, dup); + break; + default: continue; + } + } + + if (ipv4->len > 0) + { + if (ipv6->len > 0) + g_string_append (str, _("IPv4:")); + + for (i = 0; i < ipv4->len; i++) + { + dup = g_array_index (ipv4, char *, i); + g_string_append_printf (str, "\n%s", dup); + g_free (dup); + } + } + if (ipv6->len > 0) + { + if (ipv4->len > 0) + g_string_append (str, _("\n\nIPv6:")); + + for (i = 0; i < ipv6->len; i++) + { + dup = g_array_index (ipv6, char *, i); + g_string_append_printf (str, "\n%s", g_array_index (ipv6, char *, i)); + g_free (dup); + } + } + + gtk_text_buffer_set_text (dialog->ip_buffer, str->str, -1); + + freeifaddrs (myaddrs); + g_array_free (ipv4, TRUE); + g_array_free (ipv6, TRUE); + g_string_free (str, TRUE); +} + +static void +dialog_destroy (GtkObject *obj, + VncListenDialog *dialog) +{ + g_object_unref (dialog->xml); + g_slice_free (VncListenDialog, dialog); +} + +static void +dialog_response_handler (GtkDialog *widget, + gint res_id, + VncListenDialog *dialog) +{ + switch (res_id) + { + case GTK_RESPONSE_HELP: + // TODO: display the help + break; + + default: + gtk_widget_destroy (dialog->dialog); + break; + } +} + +static void +update_ui_sensitivity (VncListenDialog *dialog) +{ + gboolean listening; + gchar *str; + VinagreVncListener *listener = vinagre_vnc_listener_get_default (); + + listening = vinagre_vnc_listener_is_listening (listener); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->enable_reverse_check), + listening); + gtk_widget_set_sensitive (dialog->always_enabled_check, listening); + gtk_widget_set_sensitive (dialog->connectivity_exp, listening); + + if (listening) + { + str = g_strdup_printf (_("On the port %d"), vinagre_vnc_listener_get_port (listener)); + gtk_label_set_label (GTK_LABEL (dialog->port_label), str); + g_free (str); + } + else + { + gtk_expander_set_expanded (GTK_EXPANDER (dialog->connectivity_exp), FALSE); + } +} + +static void +enable_reverse_toggled_cb (GtkToggleButton *button, VncListenDialog *dialog) +{ + VinagreVncListener *listener = vinagre_vnc_listener_get_default (); + + if (gtk_toggle_button_get_active (button)) + vinagre_vnc_listener_start (listener); + else + { + vinagre_vnc_listener_stop (listener); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->always_enabled_check), + FALSE); + } + + update_ui_sensitivity (dialog); +} + +static void +always_enabled_toggled_cb (GtkToggleButton *button, VncListenDialog *dialog) +{ + g_object_set (vinagre_prefs_get_default (), + "always-enable-listening", gtk_toggle_button_get_active (button), + NULL); +} + +void +vinagre_vnc_listener_dialog_show (VinagreWindow *parent, VinagrePlugin *plugin) +{ + VncListenDialog *dialog; + GtkBuilder *xml; + gboolean always; + + xml = vinagre_utils_get_builder (plugin, "vnc.ui"); + if (!xml) + return; + + dialog = g_slice_new (VncListenDialog); + dialog->xml = xml; + + dialog->dialog = GTK_WIDGET (gtk_builder_get_object (xml, "listener_dialog")); + g_assert (dialog->dialog != NULL); + + dialog->ip_buffer = GTK_TEXT_BUFFER (gtk_builder_get_object (xml, "ip_textbuffer")); + g_assert (dialog->ip_buffer != NULL); + setup_ip_buffer (dialog); + + dialog->enable_reverse_check = GTK_WIDGET (gtk_builder_get_object (xml, "enable_reverse_check")); + g_assert (dialog->enable_reverse_check != NULL); + g_signal_connect (dialog->enable_reverse_check, + "toggled", + G_CALLBACK (enable_reverse_toggled_cb), + dialog); + + dialog->always_enabled_check = GTK_WIDGET (gtk_builder_get_object (xml, "always_enabled_check")); + g_assert (dialog->always_enabled_check != NULL); + g_object_get (vinagre_prefs_get_default (), + "always-enable-listening", &always, + NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->always_enabled_check), + always); + g_signal_connect (dialog->always_enabled_check, + "toggled", + G_CALLBACK (always_enabled_toggled_cb), + dialog); + + dialog->connectivity_exp = GTK_WIDGET (gtk_builder_get_object (xml, "connectivity_exp")); + g_assert (dialog->connectivity_exp != NULL); + + dialog->port_label = GTK_WIDGET (gtk_builder_get_object (xml, "port_label")); + g_assert (dialog->port_label != NULL); + + update_ui_sensitivity (dialog); + + g_signal_connect (dialog->dialog, + "destroy", + G_CALLBACK (dialog_destroy), + dialog); + + g_signal_connect (dialog->dialog, + "response", + G_CALLBACK (dialog_response_handler), + dialog); + + if (GTK_IS_WINDOW (parent)) + gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog), GTK_WINDOW (parent)); + + gtk_widget_show_all (dialog->dialog); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-listener-dialog.h vinagre-2.29.1/plugins/vnc/vinagre-vnc-listener-dialog.h --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-listener-dialog.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-listener-dialog.h 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,34 @@ +/* + * vinagre-vnc-listener-dialog.h + * This file is part of vinagre + * + * Copyright (C) 2009 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_VNC_LISTENER_DIALOG_H__ +#define __VINAGRE_VNC_LISTENER_DIALOG_H__ + +#include +#include + +G_BEGIN_DECLS + +void vinagre_vnc_listener_dialog_show (VinagreWindow *parent, VinagrePlugin *plugin); + +G_END_DECLS + +#endif /* __VINAGRE_VNC_LISTENER_DIALOG_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-listener.h vinagre-2.29.1/plugins/vnc/vinagre-vnc-listener.h --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-listener.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-listener.h 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,62 @@ +/* + * vinagre-vnc-listener.h + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_VNC_LISTENER_H__ +#define __VINAGRE_VNC_LISTENER_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_VNC_LISTENER (vinagre_vnc_listener_get_type ()) +#define VINAGRE_VNC_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_VNC_LISTENER, VinagreVncListener)) +#define VINAGRE_VNC_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_VNC_LISTENER, VinagreVncListenerClass)) +#define VINAGRE_IS_VNC_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_VNC_LISTENER)) +#define VINAGRE_IS_VNC_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_VNC_LISTENER)) +#define VINAGRE_VNC_LISTENER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_VNC_LISTENER, VinagreVncListenerClass)) + +typedef struct _VinagreVncListenerClass VinagreVncListenerClass; +typedef struct _VinagreVncListener VinagreVncListener; +typedef struct _VinagreVncListenerPrivate VinagreVncListenerPrivate; + +struct _VinagreVncListenerClass +{ + GObjectClass parent_class; +}; + +struct _VinagreVncListener +{ + GObject parent_instance; + VinagreVncListenerPrivate *priv; +}; + + +GType vinagre_vnc_listener_get_type (void) G_GNUC_CONST; + +VinagreVncListener* vinagre_vnc_listener_get_default (void); +void vinagre_vnc_listener_start (VinagreVncListener *listener); +void vinagre_vnc_listener_stop (VinagreVncListener *listener); +gboolean vinagre_vnc_listener_is_listening (VinagreVncListener *listener); +gint vinagre_vnc_listener_get_port (VinagreVncListener *listener); + +G_END_DECLS + +#endif /* __VINAGRE_VNC_LISTENER_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-plugin.c vinagre-2.29.1/plugins/vnc/vinagre-vnc-plugin.c --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-plugin.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-plugin.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,465 @@ +/* + * vinagre-vnc-plugin.c + * This file is part of vinagre + * + * Copyright (C) 2009 Jonh Wendell + * + * vinagre-vnc-plugin.c 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. + * + * vinagre-vnc-plugin.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include +#include + +#include "vinagre-vnc-plugin.h" +#include "vinagre-vnc-connection.h" +#include "vinagre-vnc-tab.h" +#include "vinagre-vnc-listener-dialog.h" +#include "vinagre-vnc-listener.h" + +#define VINAGRE_VNC_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_VNC_PLUGIN, VinagreVncPluginPrivate)) +#define WINDOW_DATA_KEY "VinagreVNCPluginWindowData" + +VINAGRE_PLUGIN_REGISTER_TYPE(VinagreVncPlugin, vinagre_vnc_plugin) + +typedef struct +{ + GtkActionGroup *ui_action_group; + guint ui_id; +} WindowData; + +typedef struct +{ + VinagrePlugin *plugin; + VinagreWindow *window; +} ActionData; + +static void +free_window_data (WindowData *data) +{ + g_return_if_fail (data != NULL); + + g_object_unref (data->ui_action_group); + g_slice_free (WindowData, data); +} + +static void +free_action_data (ActionData *data) +{ + g_return_if_fail (data != NULL); + + g_slice_free (ActionData, data); +} + +static void +listening_cb (GtkAction *action, ActionData *action_data) +{ + vinagre_vnc_listener_dialog_show (action_data->window, action_data->plugin); +} + +static GtkActionEntry action_entries[] = +{ + { "VNCListener", + NULL, + N_("_Reverse Connections..."), + NULL, + N_("Configure incoming VNC connections"), + G_CALLBACK (listening_cb) + } +}; + +static void +impl_activate (VinagrePlugin *plugin, + VinagreWindow *window) +{ + GtkActionGroup *action_group; + GtkUIManager *manager; + WindowData *data; + ActionData *action_data; + gboolean always; + + vinagre_debug_message (DEBUG_PLUGINS, "VinagreVncPlugin Activate"); + + data = g_slice_new (WindowData); + action_data = g_slice_new (ActionData); + action_data->window = window; + action_data->plugin = plugin; + + action_group = vinagre_window_get_always_sensitive_action (window); + manager = vinagre_window_get_ui_manager (window); + + data->ui_action_group = gtk_action_group_new ("VinagreVNCPluginActions"); + gtk_action_group_set_translation_domain (data->ui_action_group, GETTEXT_PACKAGE); + gtk_action_group_add_actions_full (data->ui_action_group, + action_entries, + G_N_ELEMENTS (action_entries), + action_data, + (GDestroyNotify) free_action_data); + gtk_ui_manager_insert_action_group (manager, + data->ui_action_group, + -1); + + data->ui_id = gtk_ui_manager_new_merge_id (manager); + gtk_ui_manager_add_ui (manager, + data->ui_id, + "/MenuBar/MachineMenu/MachineOps_1", + "VNCListener", + "VNCListener", + GTK_UI_MANAGER_AUTO, + TRUE); + + g_object_set_data_full (G_OBJECT (window), + WINDOW_DATA_KEY, + data, + (GDestroyNotify) free_window_data); + + g_object_get (vinagre_prefs_get_default (), + "always-enable-listening", &always, + NULL); + if (always) + vinagre_vnc_listener_start (vinagre_vnc_listener_get_default ()); +} + +static void +impl_deactivate (VinagrePlugin *plugin, + VinagreWindow *window) +{ + GtkUIManager *manager; + WindowData *data; + + vinagre_debug_message (DEBUG_PLUGINS, "VinagreVncPlugin Deactivate"); + + manager = vinagre_window_get_ui_manager (window); + data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); + g_return_if_fail (data != NULL); + + gtk_ui_manager_remove_ui (manager, data->ui_id); + gtk_ui_manager_remove_action_group (manager, data->ui_action_group); + + g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL); +} + +static void +impl_update_ui (VinagrePlugin *plugin, + VinagreWindow *window) +{ + vinagre_debug_message (DEBUG_PLUGINS, "VinagreVncPlugin Update UI"); +} + +static const GOptionEntry vinagre_vnc_args[] = +{ + { "vnc-scale", 0, 0, G_OPTION_ARG_NONE, &scaling_command_line, + /* Translators: this is a command line option (run vinagre --help) */ + N_("Enable scaled mode"), 0 }, + { NULL } +}; + +static GSList * +impl_get_context_groups (VinagrePlugin *plugin) +{ + GOptionGroup *group; + GSList *groups = NULL; + + vinagre_debug_message (DEBUG_PLUGINS, "VinagreVncPlugin Get Context Group"); + + scaling_command_line = FALSE; + group = g_option_group_new ("vnc", + /* Translators: this is a command line option (run vinagre --help) */ + _("VNC Options:"), + /* Translators: this is a command line option (run vinagre --help) */ + _("Show VNC Options"), + NULL, + NULL); + g_option_group_add_entries (group, vinagre_vnc_args); + + groups = g_slist_append (groups, group); + groups = g_slist_append (groups, vnc_display_get_option_group ()); + + return groups; +} + +static const gchar * +impl_get_protocol (VinagrePlugin *plugin) +{ + return "vnc"; +} + +static gchar ** +impl_get_public_description (VinagrePlugin *plugin) +{ + gchar **result = g_new (gchar *, 3); + + result[0] = g_strdup (_("VNC")); + result[1] = g_strdup (_("Access Unix/Linux, Windows and other machines.")); + result[2] = NULL; + + return result; +} + +static const gchar * +impl_get_mdns_service (VinagrePlugin *plugin) +{ + return "_rfb._tcp"; +} + +static VinagreConnection * +impl_new_connection (VinagrePlugin *plugin) +{ + VinagreConnection *conn; + + conn = vinagre_vnc_connection_new (); + vinagre_vnc_connection_set_scaling (VINAGRE_VNC_CONNECTION (conn), + scaling_command_line); + + return conn; +} + +static VinagreConnection * +impl_new_connection_from_file (VinagrePlugin *plugin, + const gchar *data, + gboolean use_bookmarks, + gchar **error_msg) +{ + GKeyFile *file; + GError *error; + gboolean loaded; + gchar *host, *actual_host, *protocol; + gint port; + VinagreConnection *conn; + + *error_msg = NULL; + conn = NULL; + host = NULL; + protocol = NULL; + error = NULL; + + file = g_key_file_new (); + loaded = g_key_file_load_from_data (file, + data, + -1, + 0, + &error); + if (!loaded) + { + if (error) + { + *error_msg = g_strdup (error->message); + g_error_free (error); + } + else + *error_msg = g_strdup (_("Could not parse the file.")); + + goto the_end; + } + + if (!g_key_file_has_group (file, "connection")) + { + *error_msg = g_strdup (_("The file is not a VNC one: Missing the group \"connection\".")); + goto the_end; + } + + if (!g_key_file_has_key (file, "connection", "host", NULL)) + { + *error_msg = g_strdup (_("The file is not a VNC one: Missing the key \"host\".")); + goto the_end; + } + + host = g_key_file_get_string (file, "connection", "host", NULL); + port = g_key_file_get_integer (file, "connection", "port", NULL); + if (!port) + { + if (!vinagre_connection_split_string (host, "vnc", &protocol, &actual_host, &port, error_msg)) + goto the_end; + + g_free (host); + host = actual_host; + } + + if (use_bookmarks) + conn = vinagre_bookmarks_exists (vinagre_bookmarks_get_default (), "vnc", host, port); + if (!conn) + { + gchar *s_value; + gint shared; + + conn = vinagre_vnc_connection_new (); + vinagre_connection_set_host (conn, host); + vinagre_connection_set_port (conn, port); + + s_value = g_key_file_get_string (file, "connection", "username", NULL); + vinagre_connection_set_username (conn, s_value); + g_free (s_value); + + s_value = g_key_file_get_string (file, "connection", "password", NULL); + vinagre_connection_set_password (conn, s_value); + g_free (s_value); + + shared = g_key_file_get_integer (file, "options", "shared", NULL); + if (shared == 0 || shared == 1) + vinagre_vnc_connection_set_shared (VINAGRE_VNC_CONNECTION (conn), shared); + else + g_message (_("Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it."), shared); + } + +the_end: + + g_free (host); + g_free (protocol); + g_key_file_free (file); + return conn; + +} + +static GtkWidget * +impl_new_tab (VinagrePlugin *plugin, + VinagreConnection *conn, + VinagreWindow *window) +{ + return vinagre_vnc_tab_new (conn, window); +} + +static GtkWidget * +impl_get_connect_widget (VinagrePlugin *plugin, VinagreConnection *conn) +{ + GtkWidget *box, *check, *label, *combo, *depth_box; + GtkTable *table; + gchar *str; + gint depth_profile; + + box = gtk_vbox_new (FALSE, 0); + + str = g_strdup_printf ("%s", _("VNC Options")); + label = gtk_label_new (str); + g_free (str); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_misc_set_padding (GTK_MISC (label), 0, 6); + gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); + + table = GTK_TABLE (gtk_table_new (4, 2, FALSE)); + label = gtk_label_new (" "); + gtk_table_attach (table, label, 0, 1, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0); + + check = gtk_check_button_new_with_mnemonic (_("_View only")); + g_object_set_data (G_OBJECT (box), "view_only", check); + gtk_table_attach_defaults (table, check, 1, 2, 0, 1); + if (VINAGRE_IS_VNC_CONNECTION (conn)) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), + vinagre_vnc_connection_get_view_only (VINAGRE_VNC_CONNECTION (conn))); + + check = gtk_check_button_new_with_mnemonic (_("_Scaling")); + g_object_set_data (G_OBJECT (box), "scaling", check); + gtk_table_attach_defaults (table, check, 1, 2, 1, 2); + if (VINAGRE_IS_VNC_CONNECTION (conn)) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), + vinagre_vnc_connection_get_scaling (VINAGRE_VNC_CONNECTION (conn))); + + check = gtk_check_button_new_with_mnemonic (_("_Use JPEG Compression")); + gtk_widget_set_tooltip_text (check, _("This might not work on all sort of VNC servers")); + g_object_set_data (G_OBJECT (box), "lossy", check); + gtk_table_attach_defaults (table, check, 1, 2, 2, 3); + if (VINAGRE_IS_VNC_CONNECTION (conn)) + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), + vinagre_vnc_connection_get_lossy_encoding (VINAGRE_VNC_CONNECTION (conn))); + + depth_box = gtk_hbox_new (FALSE, 4); + label = gtk_label_new_with_mnemonic (_("_Depth Color:")); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_box_pack_start (GTK_BOX (depth_box), GTK_WIDGET (label), FALSE, FALSE, 0); + + if (VINAGRE_IS_VNC_CONNECTION (conn)) + depth_profile = vinagre_vnc_connection_get_depth_profile (VINAGRE_VNC_CONNECTION (conn)); + else + depth_profile = 0; + + combo = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Use Server Settings")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("True Color (24 bits)")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("High Color (16 bits)")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Low Color (8 bits)")); + gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Ultra Low Color (3 bits)")); + gtk_combo_box_set_active (GTK_COMBO_BOX (combo), depth_profile); + g_object_set_data (G_OBJECT (box), "depth_combo", combo); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo); + gtk_box_pack_start (GTK_BOX (depth_box), GTK_WIDGET (combo), FALSE, FALSE, 0); + gtk_table_attach_defaults (table, depth_box, 1, 2, 3, 4); + + gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (table), FALSE, FALSE, 0); + return box; +} + +static gint +impl_get_default_port (VinagrePlugin *plugin) +{ + return 5900; +} + +static GtkFileFilter * +impl_get_file_filter (VinagrePlugin *plugin) +{ + GtkFileFilter *filter; + + filter = gtk_file_filter_new (); + /* Translators: this is a pattern to open *.vnc files in a open dialog. */ + gtk_file_filter_set_name (filter, _("VNC Files")); + gtk_file_filter_add_pattern (filter, "*.vnc"); + + return filter; +} + +static void +vinagre_vnc_plugin_init (VinagreVncPlugin *plugin) +{ + vinagre_debug_message (DEBUG_PLUGINS, "VinagreVncPlugin initializing"); +} + +static void +vinagre_vnc_plugin_finalize (GObject *object) +{ + vinagre_debug_message (DEBUG_PLUGINS, "VinagreVncPlugin finalizing"); + + G_OBJECT_CLASS (vinagre_vnc_plugin_parent_class)->finalize (object); +} + +static void +vinagre_vnc_plugin_class_init (VinagreVncPluginClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + VinagrePluginClass *plugin_class = VINAGRE_PLUGIN_CLASS (klass); + + object_class->finalize = vinagre_vnc_plugin_finalize; + + plugin_class->activate = impl_activate; + plugin_class->deactivate = impl_deactivate; + plugin_class->update_ui = impl_update_ui; + plugin_class->get_context_groups = impl_get_context_groups; + plugin_class->get_protocol = impl_get_protocol; + plugin_class->get_public_description = impl_get_public_description; + plugin_class->new_connection = impl_new_connection; + plugin_class->new_connection_from_file = impl_new_connection_from_file; + plugin_class->get_mdns_service = impl_get_mdns_service; + plugin_class->new_tab = impl_new_tab; + plugin_class->get_connect_widget = impl_get_connect_widget; + plugin_class->get_default_port = impl_get_default_port; + plugin_class->get_file_filter = impl_get_file_filter; +} +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-plugin.h vinagre-2.29.1/plugins/vnc/vinagre-vnc-plugin.h --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-plugin.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-plugin.h 2009-09-22 20:43:06.000000000 +0100 @@ -0,0 +1,74 @@ +/* + * vinagre-vnc-plugin.h + * This file is part of vinagre + * + * Copyright (C) 2009 Jorge Pereira + * + * vinagre-vnc-plugin.h 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. + * + * vinagre-vnc-plugin.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_VNC_PLUGIN_H__ +#define __VINAGRE_VNC_PLUGIN_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +/* + * Type checking and casting macros + */ +#define VINAGRE_TYPE_VNC_PLUGIN (vinagre_vnc_plugin_get_type ()) +#define VINAGRE_VNC_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), VINAGRE_TYPE_VNC_PLUGIN, VinagreVncPlugin)) +#define VINAGRE_VNC_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), VINAGRE_TYPE_VNC_PLUGIN, VinagreVncPluginClass)) +#define VINAGRE_IS_VNC_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), VINAGRE_TYPE_VNC_PLUGIN)) +#define VINAGRE_IS_VNC_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), VINAGRE_TYPE_VNC_PLUGIN)) +#define VINAGRE_VNC_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), VINAGRE_TYPE_VNC_PLUGIN, VinagreVncPluginClass)) + +/* Private structure type */ +typedef struct _VinagreVncPluginPrivate VinagreVncPluginPrivate; + +/* + * Main object structure + */ +typedef struct _VinagreVncPlugin VinagreVncPlugin; + +struct _VinagreVncPlugin +{ + VinagrePlugin parent_instance; +}; + +/* + * Class definition + */ +typedef struct _VinagreVncPluginClass VinagreVncPluginClass; + +struct _VinagreVncPluginClass +{ + VinagrePluginClass parent_class; +}; + +/* + * Public methods + */ +GType vinagre_vnc_plugin_get_type (void) G_GNUC_CONST; + +/* All the plugins must implement this function */ +G_MODULE_EXPORT GType register_vinagre_plugin (GTypeModule *module); + +G_END_DECLS + +#endif /* __VINAGRE_VNC_PLUGIN_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-tab.c vinagre-2.29.1/plugins/vnc/vinagre-vnc-tab.c --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-tab.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-tab.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,1135 @@ +/* + * vinagre-vnc-tab.c + * VNC Implementation for VinagreVncTab widget + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include + +#include +#include + +#include "vinagre-vnc-tab.h" +#include "vinagre-vnc-connection.h" + +#define VINAGRE_VNC_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_VNC_TAB, VinagreVncTabPrivate)) + +struct _VinagreVncTabPrivate +{ + GtkWidget *vnc; + gboolean pointer_grab; + gchar *clipboard_str; + GSList *connected_actions, *initialized_actions; + GtkWidget *viewonly_button, *scaling_button; + GtkAction *scaling_action, *viewonly_action, *original_size_action; + gulong signal_clipboard; +}; + +G_DEFINE_TYPE (VinagreVncTab, vinagre_vnc_tab, VINAGRE_TYPE_TAB) + +/* Properties */ +enum +{ + PROP_0, + PROP_ORIGINAL_WIDTH, + PROP_ORIGINAL_HEIGHT +}; + +static void open_vnc (VinagreVncTab *vnc_tab); +static void setup_toolbar (VinagreVncTab *vnc_tab); + +static void +vinagre_vnc_tab_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + VinagreVncTab *tab = VINAGRE_VNC_TAB (object); + + switch (prop_id) + { + case PROP_ORIGINAL_WIDTH: + g_value_set_int (value, vinagre_vnc_tab_get_original_width (tab)); + break; + case PROP_ORIGINAL_HEIGHT: + g_value_set_int (value, vinagre_vnc_tab_get_original_height (tab)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +view_scaling_cb (GtkAction *action, VinagreVncTab *vnc_tab) +{ + vinagre_vnc_tab_set_scaling (vnc_tab, + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); +} + +static void +view_viewonly_cb (GtkAction *action, VinagreVncTab *vnc_tab) +{ + vinagre_vnc_tab_set_viewonly (vnc_tab, + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); +} + +static void +send_ctrlaltdel_cb (GtkAction *action, VinagreVncTab *vnc_tab) +{ + vinagre_vnc_tab_send_ctrlaltdel (vnc_tab); +} + +static void +view_original_size_cb (GtkAction *action, VinagreVncTab *vnc_tab) +{ + vinagre_vnc_tab_original_size (vnc_tab); +} + +static void +view_refresh_cb (GtkAction *action, VinagreVncTab *vnc_tab) +{ + vnc_display_request_update (VNC_DISPLAY (vnc_tab->priv->vnc)); +} + +const static GSList * +vnc_get_connected_actions (VinagreTab *tab) +{ + VinagreVncTab *vnc_tab = VINAGRE_VNC_TAB (tab); + + return vnc_tab->priv->connected_actions; +} + +const static GSList * +vnc_get_initialized_actions (VinagreTab *tab) +{ + VinagreVncTab *vnc_tab = VINAGRE_VNC_TAB (tab); + + return vnc_tab->priv->initialized_actions; +} + +static gchar * +vnc_tab_get_tooltip (VinagreTab *tab) +{ + VinagreVncTab *vnc_tab = VINAGRE_VNC_TAB (tab); + VinagreConnection *conn = vinagre_tab_get_conn (tab); + + return g_markup_printf_escaped ( + "%s %s\n\n" + "%s %s\n" + "%s %d\n" + "%s %dx%d", + _("Desktop Name:"), vnc_display_get_name (VNC_DISPLAY (vnc_tab->priv->vnc)), + _("Host:"), vinagre_connection_get_host (conn), + _("Port:"), vinagre_connection_get_port (conn), + _("Dimensions:"), vnc_display_get_width (VNC_DISPLAY (vnc_tab->priv->vnc)), vnc_display_get_height (VNC_DISPLAY (vnc_tab->priv->vnc))); +} + +static GdkPixbuf * +vnc_tab_get_screenshot (VinagreTab *tab) +{ + VinagreVncTab *vnc_tab = VINAGRE_VNC_TAB (tab); + + return vnc_display_get_pixbuf (VNC_DISPLAY (vnc_tab->priv->vnc)); +} + +static void +vinagre_vnc_tab_finalize (GObject *object) +{ + VinagreVncTab *vnc_tab = VINAGRE_VNC_TAB (object); + + g_free (vnc_tab->priv->clipboard_str); + + G_OBJECT_CLASS (vinagre_vnc_tab_parent_class)->finalize (object); +} + +static void +vinagre_vnc_tab_dispose (GObject *object) +{ + VinagreVncTab *vnc_tab = VINAGRE_VNC_TAB (object); + + if (vnc_tab->priv->connected_actions) + { + vinagre_tab_free_actions (vnc_tab->priv->connected_actions); + vnc_tab->priv->connected_actions = NULL; + } + + if (vnc_tab->priv->initialized_actions) + { + vinagre_tab_free_actions (vnc_tab->priv->initialized_actions); + vnc_tab->priv->initialized_actions = NULL; + } + + if (vnc_tab->priv->signal_clipboard != 0) + { + GtkClipboard *cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + + g_signal_handler_disconnect (cb, + vnc_tab->priv->signal_clipboard); + vnc_tab->priv->signal_clipboard = 0; + } + + G_OBJECT_CLASS (vinagre_vnc_tab_parent_class)->dispose (object); +} + +static void +vinagre_vnc_tab_constructed (GObject *object) +{ + VinagreVncTab *vnc_tab = VINAGRE_VNC_TAB (object); + + if (G_OBJECT_CLASS (vinagre_vnc_tab_parent_class)->constructed) + G_OBJECT_CLASS (vinagre_vnc_tab_parent_class)->constructed (object); + + setup_toolbar (vnc_tab); + open_vnc (vnc_tab); +} + +static void +vinagre_vnc_tab_class_init (VinagreVncTabClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + VinagreTabClass* tab_class = VINAGRE_TAB_CLASS (klass); + + object_class->finalize = vinagre_vnc_tab_finalize; + object_class->dispose = vinagre_vnc_tab_dispose; + object_class->get_property = vinagre_vnc_tab_get_property; + object_class->constructed = vinagre_vnc_tab_constructed; + + tab_class->impl_get_tooltip = vnc_tab_get_tooltip; + tab_class->impl_get_connected_actions = vnc_get_connected_actions; + tab_class->impl_get_initialized_actions = vnc_get_initialized_actions; + tab_class->impl_get_screenshot = vnc_tab_get_screenshot; + + g_object_class_install_property (object_class, + PROP_ORIGINAL_WIDTH, + g_param_spec_int ("original-width", + "Original width", + "The original width of the remote screen", + -1, G_MAXINT, 0, + G_PARAM_READABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_ORIGINAL_HEIGHT, + g_param_spec_int ("original-height", + "Original height", + "The original height of the remote screen", + -1, G_MAXINT, 0, + G_PARAM_READABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_type_class_add_private (object_class, sizeof (VinagreVncTabPrivate)); +} + +static void +open_vnc (VinagreVncTab *vnc_tab) +{ + gchar *host, *port_str; + gint port, shared, fd, depth_profile; + gboolean scaling, success, lossy_encoding; + VncDisplay *vnc = VNC_DISPLAY (vnc_tab->priv->vnc); + VinagreTab *tab = VINAGRE_TAB (vnc_tab); + + g_object_get (vinagre_tab_get_conn (tab), + "port", &port, + "host", &host, + "scaling", &scaling, + "shared", &shared, + "fd", &fd, + "depth-profile", &depth_profile, + "lossy-encoding", &lossy_encoding, + NULL); + + port_str = g_strdup_printf ("%d", port); + if (shared == -1) + g_object_get (vinagre_prefs_get_default (), + "shared-flag", &shared, + NULL); + + vnc_display_set_shared_flag (vnc, shared); + vnc_display_set_force_size (vnc, !scaling); + vnc_display_set_depth (vnc, depth_profile); + vnc_display_set_lossy_encoding (vnc, lossy_encoding); + + if (fd > 0) + success = vnc_display_open_fd (vnc, fd); + else + success = vnc_display_open_host (vnc, host, port_str); + + if (success) + gtk_widget_grab_focus (GTK_WIDGET (vnc)); + else + vinagre_utils_show_error (NULL, + _("Error connecting to host."), + GTK_WINDOW (vinagre_tab_get_window (tab))); + + g_free (port_str); + g_free (host); +} + +static void +vnc_connected_cb (VncDisplay *vnc, VinagreVncTab *tab) +{ + g_signal_emit_by_name (G_OBJECT (tab), "tab-connected"); +} + +static void +vnc_disconnected_cb (VncDisplay *vnc, VinagreVncTab *tab) +{ + g_signal_emit_by_name (G_OBJECT (tab), "tab-disconnected"); +} + +static void +vnc_auth_failed_cb (VncDisplay *vnc, const gchar *msg, VinagreVncTab *vnc_tab) +{ + vinagre_tab_remove_credentials_from_keyring (VINAGRE_TAB (vnc_tab)); + g_signal_emit_by_name (vnc_tab, "tab-auth-failed", msg); +} + +static void +vnc_auth_unsupported_cb (VncDisplay *vnc, guint auth_type, VinagreVncTab *vnc_tab) +{ + GString *message; + gchar *name, *emphasis; + VinagreTab *tab = VINAGRE_TAB (vnc_tab); + + message = g_string_new (NULL); + name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab)); + emphasis = g_strdup_printf ("%s", name); + + /* Translators: %s is a host name or IP address; %u is a code error (number). */ + g_string_printf (message, _("Authentication method to host %s is unsupported. (%u)"), + emphasis, + auth_type); + + vinagre_utils_show_error (_("Authentication unsupported"), + message->str, + GTK_WINDOW (vinagre_tab_get_window (tab))); + g_string_free (message, TRUE); + g_free (name); + g_free (emphasis); + + vinagre_tab_remove_from_notebook (tab); +} + +/* text was actually requested */ +static void +copy_cb (GtkClipboard *clipboard, + GtkSelectionData *data, + guint info, + VinagreVncTab *vnc_tab) +{ + gtk_selection_data_set_text (data, vnc_tab->priv->clipboard_str, -1); +} + +static void +vnc_server_cut_text_cb (VncDisplay *vnc, const gchar *text, VinagreVncTab *vnc_tab) +{ + GtkClipboard *cb; + gsize a, b; + GtkTargetEntry targets[] = { + {"UTF8_STRING", 0, 0}, + {"COMPOUND_TEXT", 0, 0}, + {"TEXT", 0, 0}, + {"STRING", 0, 0}, + }; + + if (!text) + return; + + g_free (vnc_tab->priv->clipboard_str); + vnc_tab->priv->clipboard_str = g_convert (text, -1, "utf-8", "iso8859-1", &a, &b, NULL); + + if (vnc_tab->priv->clipboard_str) + { + cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + + gtk_clipboard_set_with_owner (cb, + targets, + G_N_ELEMENTS(targets), + (GtkClipboardGetFunc) copy_cb, + NULL, + G_OBJECT (vnc_tab)); + } +} + +static void +vnc_initialized_cb (VncDisplay *vnc, VinagreVncTab *vnc_tab) +{ + GtkLabel *label; + gchar *name; + gboolean scaling, view_only, fullscreen; + VinagreTab *tab = VINAGRE_TAB (vnc_tab); + VinagreConnection *conn = vinagre_tab_get_conn (tab); + + g_object_get (conn, + "view-only", &view_only, + "scaling", &scaling, + "fullscreen", &fullscreen, + NULL); + + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (vnc_tab->priv->scaling_action), scaling); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (vnc_tab->priv->viewonly_action), view_only); + vnc_display_set_pointer_local (vnc, TRUE); + vnc_display_set_keyboard_grab (vnc, TRUE); + vnc_display_set_pointer_grab (vnc, TRUE); + + vinagre_vnc_connection_set_desktop_name (VINAGRE_VNC_CONNECTION (conn), + vnc_display_get_name (vnc)); + + name = vinagre_connection_get_best_name (conn); + label = g_object_get_data (G_OBJECT (tab), "label"); + g_return_if_fail (label != NULL); + gtk_label_set_label (label, name); + g_free (name); + + vinagre_tab_save_credentials_in_keyring (tab); + vinagre_tab_add_recent_used (tab); + vinagre_tab_set_state (tab, VINAGRE_TAB_STATE_CONNECTED); + + g_signal_emit_by_name (G_OBJECT (tab), "tab-initialized"); +} + +typedef struct { + GtkWidget *uname, *pw, *button; +} ControlOKButton; + +static void +control_ok_button (GtkEditable *entry, ControlOKButton *data) +{ + gboolean enabled = TRUE; + + if (GTK_WIDGET_VISIBLE (data->uname)) + enabled = enabled && gtk_entry_get_text_length (GTK_ENTRY (data->uname)) > 0; + + if (GTK_WIDGET_VISIBLE (data->pw)) + enabled = enabled && gtk_entry_get_text_length (GTK_ENTRY (data->pw)) > 0; + + gtk_widget_set_sensitive (data->button, enabled); +} + +static gboolean +ask_credential (VinagreVncTab *vnc_tab, + gboolean need_username, + gboolean need_password, + gchar **username, + gchar **password) +{ + GtkBuilder *xml; + GtkWidget *password_dialog, *host_label, *save_credential_check; + GtkWidget *password_label, *username_label, *image; + gchar *name; + int result; + ControlOKButton control; + VinagreTab *tab = VINAGRE_TAB (vnc_tab); + VinagreConnection *conn = vinagre_tab_get_conn (tab); + + xml = vinagre_utils_get_builder (NULL, NULL); + + password_dialog = GTK_WIDGET (gtk_builder_get_object (xml, "auth_required_dialog")); + gtk_window_set_transient_for (GTK_WINDOW(password_dialog), + GTK_WINDOW(vinagre_tab_get_window (tab))); + + host_label = GTK_WIDGET (gtk_builder_get_object (xml, "host_label")); + name = vinagre_connection_get_best_name (conn); + gtk_label_set_label (GTK_LABEL (host_label), name); + g_free (name); + + control.uname = GTK_WIDGET (gtk_builder_get_object (xml, "username_entry")); + control.pw = GTK_WIDGET (gtk_builder_get_object (xml, "password_entry")); + control.button = GTK_WIDGET (gtk_builder_get_object (xml, "ok_button")); + password_label = GTK_WIDGET (gtk_builder_get_object (xml, "password_label")); + username_label = GTK_WIDGET (gtk_builder_get_object (xml, "username_label")); + save_credential_check = GTK_WIDGET (gtk_builder_get_object (xml, "save_credential_check")); + + image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (control.button), image); + + g_signal_connect (control.uname, "changed", G_CALLBACK (control_ok_button), &control); + g_signal_connect (control.pw, "changed", G_CALLBACK (control_ok_button), &control); + + if (need_username) + { + if (*username) + gtk_entry_set_text (GTK_ENTRY (control.uname), *username); + } + else + { + gtk_widget_hide (username_label); + gtk_widget_hide (control.uname); + } + + if (need_password) + { + if (*password) + gtk_entry_set_text (GTK_ENTRY (control.pw), *password); + } + else + { + gtk_widget_hide (password_label); + gtk_widget_hide (control.pw); + } + + result = gtk_dialog_run (GTK_DIALOG (password_dialog)); + if (result == -5) + { + g_free (*username); + if (gtk_entry_get_text_length (GTK_ENTRY (control.uname)) > 0) + *username = g_strdup (gtk_entry_get_text (GTK_ENTRY (control.uname))); + else + *username = NULL; + + g_free (*password); + if (gtk_entry_get_text_length (GTK_ENTRY (control.pw)) > 0) + *password = g_strdup (gtk_entry_get_text (GTK_ENTRY (control.pw))); + else + *password = NULL; + + vinagre_tab_set_save_credentials (tab, + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (save_credential_check))); + } + + gtk_widget_destroy (GTK_WIDGET (password_dialog)); + g_object_unref (xml); + + return result == -5; +} + +static void +vnc_authentication_cb (VncDisplay *vnc, GValueArray *credList, VinagreVncTab *vnc_tab) +{ + gchar *username, *password; + gboolean need_password, need_username; + int i; + VinagreTab *tab = VINAGRE_TAB (vnc_tab); + VinagreConnection *conn = vinagre_tab_get_conn (tab); + VinagreWindow *window = vinagre_tab_get_window (tab); + + if (credList == NULL) + return; + + need_password = FALSE; + need_username = FALSE; + username = NULL; + password = NULL; + + for (i = 0; i < credList->n_values; i++) { + switch (g_value_get_enum (&credList->values[i])) + { + case VNC_DISPLAY_CREDENTIAL_USERNAME: + if (vinagre_connection_get_username (conn)) + { + vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_USERNAME, vinagre_connection_get_username (conn)); + break; + } + need_username= TRUE; + break; + + case VNC_DISPLAY_CREDENTIAL_PASSWORD: + if (vinagre_connection_get_password (conn)) + { + vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_PASSWORD, vinagre_connection_get_password (conn)); + break; + } + need_password = TRUE; + break; + + case VNC_DISPLAY_CREDENTIAL_CLIENTNAME: + vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_CLIENTNAME, "vinagre"); + break; + } + } + + if (need_password || need_username) + { + vinagre_tab_find_credentials_in_keyring (tab, &username, &password); + if ( (need_username && !username) || (need_password && !password) ) + { + if (!ask_credential (vnc_tab, need_username, need_password, &username, &password)) + { + vinagre_tab_remove_from_notebook (tab); + goto out; + } + } + + if (need_username) + { + if (username) + { + vinagre_connection_set_username (conn, username); + vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_USERNAME, username); + } + else + { + vinagre_tab_remove_from_notebook (tab); + vinagre_utils_show_error (_("Authentication error"), + _("A username is required in order to access this machine."), + GTK_WINDOW (window)); + goto out; + } + } + + if (need_password) + { + if (password) + { + vinagre_connection_set_password (conn, password); + vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_PASSWORD, password); + } + else + { + vinagre_tab_remove_from_notebook (tab); + vinagre_utils_show_error (_("Authentication error"), + _("A password is required in order to access this machine."), + GTK_WINDOW (window)); + goto out; + } + } + +out: + g_free (username); + g_free (password); + } +} + +static void +vnc_pointer_grab_cb (VncDisplay *vnc, VinagreVncTab *vnc_tab) +{ + vnc_tab->priv->pointer_grab = TRUE; +} + +static void +vnc_pointer_ungrab_cb (VncDisplay *vnc, VinagreVncTab *vnc_tab) +{ + vnc_tab->priv->pointer_grab = FALSE; +} + +static void +vnc_bell_cb (VncDisplay *vnc, VinagreVncTab *vnc_tab) +{ + gdk_window_beep (GTK_WIDGET (vnc_tab)->window); +} + +static void +vnc_desktop_resize_cb (VncDisplay *vnc, int x, int y, VinagreVncTab *tab) +{ + g_object_notify (G_OBJECT (tab), "original-width"); + g_object_notify (G_OBJECT (tab), "original-height"); + g_object_notify (G_OBJECT (tab), "tooltip"); +} + +static GSList * +create_connected_actions (VinagreVncTab *tab) +{ + GSList *list = NULL; + VinagreTabUiAction *a; + + /* View->Scaling */ + a = g_new (VinagreTabUiAction, 1); + a->paths = g_new (gchar *, 3); + a->paths[0] = g_strdup ("/MenuBar/ViewMenu"); + a->paths[1] = g_strdup ("/ToolBar"); + a->paths[2] = NULL; + a->action = GTK_ACTION (gtk_toggle_action_new ("VNCViewScaling", + _("S_caling"), + _("Fits the remote screen into the current window size"), + "zoom-fit-best")); + gtk_action_set_icon_name (a->action, "zoom-fit-best"); + g_signal_connect (a->action, "activate", G_CALLBACK (view_scaling_cb), tab); + list = g_slist_append (list, a); + tab->priv->scaling_action = a->action; + + /* View->View Only */ + a = g_new (VinagreTabUiAction, 1); + a->paths = g_new (gchar *, 3); + a->paths[0] = g_strdup ("/MenuBar/ViewMenu"); + a->paths[1] = g_strdup ("/ToolBar"); + a->paths[2] = NULL; + a->action = GTK_ACTION (gtk_toggle_action_new ("VNCViewViewOnly", + _("_View only"), + _("Does not send mouse and keyboard events"), + "emblem-readonly")); + gtk_action_set_icon_name (a->action, "emblem-readonly"); + g_signal_connect (a->action, "activate", G_CALLBACK (view_viewonly_cb), tab); + list = g_slist_append (list, a); + tab->priv->viewonly_action = a->action; + + /* View->Original Size */ + a = g_new (VinagreTabUiAction, 1); + a->paths = g_new (gchar *, 2); + a->paths[0] = g_strdup ("/MenuBar/ViewMenu"); + a->paths[1] = NULL; + a->action = gtk_action_new ("VNCViewOriginalSize", + _("_Original size"), + _("Adjusts the window to the remote desktop's size"), + "zoom-original"); + gtk_action_set_icon_name (a->action, "zoom-original"); + g_signal_connect (a->action, "activate", G_CALLBACK (view_original_size_cb), tab); + list = g_slist_append (list, a); + tab->priv->original_size_action = a->action; + + /* View->Refresh */ + a = g_new (VinagreTabUiAction, 1); + a->paths = g_new (gchar *, 2); + a->paths[0] = g_strdup ("/MenuBar/ViewMenu"); + a->paths[1] = NULL; + a->action = gtk_action_new ("VNCViewRefresh", + _("_Refresh Screen"), + _("Requests an update of the screen"), + "gtk-refresh"); + gtk_action_set_icon_name (a->action, "gtk-refresh"); + g_signal_connect (a->action, "activate", G_CALLBACK (view_refresh_cb), tab); + list = g_slist_append (list, a); + + return list; +} + +static GSList * +create_initialized_actions (VinagreVncTab *tab) +{ + GSList *list = NULL; + VinagreTabUiAction *a; + + /* Machine->Send CTRL-ALT-DEL */ + a = g_new (VinagreTabUiAction, 1); + a->paths = g_new (gchar *, 3); + a->paths[0] = g_strdup ("/MenuBar/MachineMenu/MachineOps_1"); + a->paths[1] = g_strdup ("/ToolBar"); + a->paths[2] = NULL; + a->action = gtk_action_new ("VNCMachineSendCtrlAltDel", + _("Send Ctrl-Alt-Del"), + _("Sends Ctrl+Alt+Del to the remote machine"), + "preferences-desktop-keyboard-shortcuts"); + gtk_action_set_is_important (a->action, TRUE); + gtk_action_set_icon_name (a->action, "preferences-desktop-keyboard-shortcuts"); + g_signal_connect (a->action, "activate", G_CALLBACK (send_ctrlaltdel_cb), tab); + list = g_slist_append (list, a); + + return list; +} + +static void +viewonly_button_clicked (GtkToggleToolButton *button, + VinagreVncTab *vnc_tab) +{ + vinagre_vnc_tab_set_viewonly (vnc_tab, gtk_toggle_tool_button_get_active (button)); + + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (vnc_tab->priv->viewonly_action), + vinagre_vnc_tab_get_viewonly (vnc_tab)); +} + +static void +scaling_button_clicked (GtkToggleToolButton *button, + VinagreVncTab *vnc_tab) +{ + if (!vinagre_vnc_tab_set_scaling (vnc_tab, gtk_toggle_tool_button_get_active (button))) + gtk_toggle_tool_button_set_active (button, FALSE); + + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (vnc_tab->priv->scaling_action), + vinagre_vnc_tab_get_scaling (vnc_tab)); +} + +static void +cad_button_clicked (GtkToolButton *button, + VinagreVncTab *vnc_tab) +{ + vinagre_vnc_tab_send_ctrlaltdel (vnc_tab); +} + +static void +setup_toolbar (VinagreVncTab *vnc_tab) +{ + GtkWidget *toolbar = vinagre_tab_get_toolbar (VINAGRE_TAB (vnc_tab)); + GtkWidget *button; + + /* Space */ + button = GTK_WIDGET (gtk_separator_tool_item_new ()); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE); + gtk_widget_show (GTK_WIDGET (button)); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (button), -1); + + /* Scaling */ + button = GTK_WIDGET (gtk_toggle_tool_button_new ()); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (button), _("Scaling")); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Scaling")); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "zoom-fit-best"); + gtk_widget_show (GTK_WIDGET (button)); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (button), -1); + g_signal_connect (button, "toggled", G_CALLBACK (scaling_button_clicked), vnc_tab); + vnc_tab->priv->scaling_button = button; + + /* Read only */ + button = GTK_WIDGET (gtk_toggle_tool_button_new ()); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (button), _("Read only")); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Read only")); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "emblem-readonly"); + gtk_widget_show (GTK_WIDGET (button)); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (button), -1); + g_signal_connect (button, "toggled", G_CALLBACK (viewonly_button_clicked), vnc_tab); + vnc_tab->priv->viewonly_button = button; + + /* Send Ctrl-alt-del */ + button = GTK_WIDGET (gtk_tool_button_new (NULL, _("Send Ctrl-Alt-Del"))); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "preferences-desktop-keyboard-shortcuts"); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Send Ctrl-Alt-Del")); + g_signal_connect (button, "clicked", G_CALLBACK (cad_button_clicked), vnc_tab); + gtk_widget_show (GTK_WIDGET (button)); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (button), -1); +} + +static void +vnc_tab_clipboard_cb (GtkClipboard *cb, GdkEvent *event, VinagreVncTab *vnc_tab) +{ + VinagreTab *tab = VINAGRE_TAB (vnc_tab); + gchar *text; + + if (vinagre_notebook_get_active_tab (vinagre_tab_get_notebook (tab)) != tab) + return; + + if (VINAGRE_IS_TAB (gtk_clipboard_get_owner (cb))) + return; + + text = gtk_clipboard_wait_for_text (cb); + if (!text) + return; + + vinagre_vnc_tab_paste_text (vnc_tab, text); + g_free (text); +} + +/* + * Called when the main container widget's size has been set. + * It attempts to fit the VNC widget into this space while + * maintaining aspect ratio + * + * Code borrowed from from virt-viewer, thanks Daniel Berrange :) + */ +static void +vnc_tab_resize_align (GtkWidget *widget, + GtkAllocation *alloc, + VinagreVncTab *vnc_tab) +{ + double desktopAspect = (double)vnc_display_get_width (VNC_DISPLAY (vnc_tab->priv->vnc)) / (double)vnc_display_get_height (VNC_DISPLAY (vnc_tab->priv->vnc)); + double scrollAspect = (double)alloc->width / (double)alloc->height; + int height, width; + GtkAllocation child; + int dx = 0, dy = 0; + + if (!vnc_display_is_open (VNC_DISPLAY (vnc_tab->priv->vnc))) + return; + + if (scrollAspect > desktopAspect) + { + width = alloc->height * desktopAspect; + dx = (alloc->width - width) / 2; + height = alloc->height; + } + else + { + width = alloc->width; + height = alloc->width / desktopAspect; + dy = (alloc->height - height) / 2; + } + + child.x = alloc->x + dx; + child.y = alloc->y + dy; + child.width = width; + child.height = height; + gtk_widget_size_allocate(vnc_tab->priv->vnc, &child); +} + +static void +vinagre_vnc_tab_init (VinagreVncTab *vnc_tab) +{ + GtkClipboard *cb; + GtkWidget *align; + + vnc_tab->priv = VINAGRE_VNC_TAB_GET_PRIVATE (vnc_tab); + vnc_tab->priv->clipboard_str = NULL; + vnc_tab->priv->connected_actions = create_connected_actions (vnc_tab); + vnc_tab->priv->initialized_actions = create_initialized_actions (vnc_tab); + + /* Create the vnc widget */ + vnc_tab->priv->vnc = vnc_display_new (); + align = gtk_alignment_new (0.5, 0.5, 1, 1); + + g_signal_connect(align, "size-allocate", + G_CALLBACK (vnc_tab_resize_align), vnc_tab); + gtk_container_add (GTK_CONTAINER (align), vnc_tab->priv->vnc); + + vinagre_tab_add_view (VINAGRE_TAB (vnc_tab), align); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-connected", + G_CALLBACK (vnc_connected_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-initialized", + G_CALLBACK (vnc_initialized_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-disconnected", + G_CALLBACK (vnc_disconnected_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-auth-credential", + G_CALLBACK (vnc_authentication_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-pointer-grab", + G_CALLBACK (vnc_pointer_grab_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-pointer-ungrab", + G_CALLBACK (vnc_pointer_ungrab_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-auth-failure", + G_CALLBACK (vnc_auth_failed_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-auth-unsupported", + G_CALLBACK (vnc_auth_unsupported_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-server-cut-text", + G_CALLBACK (vnc_server_cut_text_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-bell", + G_CALLBACK (vnc_bell_cb), + vnc_tab); + + g_signal_connect (vnc_tab->priv->vnc, + "vnc-desktop-resize", + G_CALLBACK (vnc_desktop_resize_cb), + vnc_tab); + + /* Setup the clipboard */ + cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + vnc_tab->priv->signal_clipboard = g_signal_connect (cb, + "owner-change", + G_CALLBACK (vnc_tab_clipboard_cb), + vnc_tab); + + + gtk_widget_show_all (GTK_WIDGET (vnc_tab)); +} + +GtkWidget * +vinagre_vnc_tab_new (VinagreConnection *conn, + VinagreWindow *window) +{ + return GTK_WIDGET (g_object_new (VINAGRE_TYPE_VNC_TAB, + "conn", conn, + "window", window, + NULL)); +} + +void +vinagre_vnc_tab_send_ctrlaltdel (VinagreVncTab *tab) +{ + guint keys[] = { GDK_Control_L, GDK_Alt_L, GDK_Delete }; + + g_return_if_fail (VINAGRE_IS_VNC_TAB (tab)); + + vnc_display_send_keys_ex (VNC_DISPLAY (tab->priv->vnc), keys, sizeof (keys) / sizeof (keys[0]), VNC_DISPLAY_KEY_EVENT_CLICK); +} + +void +vinagre_vnc_tab_paste_text (VinagreVncTab *tab, const gchar *text) +{ + gchar *out; + gsize a, b; + GError *error = NULL; + + g_return_if_fail (VINAGRE_IS_VNC_TAB (tab)); + + out = g_convert_with_fallback (text, -1, "iso8859-1//TRANSLIT", "utf-8", NULL, &a, &b, &error); + if (out) + { + vnc_display_client_cut_text (VNC_DISPLAY (tab->priv->vnc), out); + g_free (out); + } + else + { + g_warning ("%s", error->message); + g_error_free (error); + } +} + +gboolean +vinagre_vnc_tab_set_scaling (VinagreVncTab *tab, gboolean active) { + g_return_val_if_fail (VINAGRE_IS_VNC_TAB (tab), FALSE); + + if (vnc_display_get_scaling (VNC_DISPLAY (tab->priv->vnc)) == active) + return TRUE; + + vnc_display_set_force_size (VNC_DISPLAY(tab->priv->vnc), !active); + if (!vnc_display_set_scaling (VNC_DISPLAY (tab->priv->vnc), active)) + { + vinagre_utils_show_error (NULL, _("Scaling is not supported on this installation.\n\nRead the README file (shipped with Vinagre) in order to know how to enable this feature."), + GTK_WINDOW (vinagre_tab_get_window (VINAGRE_TAB (tab)))); + return FALSE; + } + + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (tab->priv->scaling_button), + active); + + if (active) + gtk_widget_set_size_request (tab->priv->vnc, 0, 0); + else + gtk_widget_set_size_request (tab->priv->vnc, + vnc_display_get_width (VNC_DISPLAY (tab->priv->vnc)), + vnc_display_get_height (VNC_DISPLAY (tab->priv->vnc))); + + return TRUE; +} + +gboolean +vinagre_vnc_tab_get_scaling (VinagreVncTab *tab) { + g_return_val_if_fail (VINAGRE_IS_VNC_TAB (tab), FALSE); + + return vnc_display_get_scaling (VNC_DISPLAY (tab->priv->vnc)); +} + +void +vinagre_vnc_tab_set_viewonly (VinagreVncTab *tab, gboolean active) { + g_return_if_fail (VINAGRE_IS_VNC_TAB (tab)); + + vnc_display_set_read_only (VNC_DISPLAY (tab->priv->vnc), active); + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (tab->priv->viewonly_button), + active); + +} + +gboolean +vinagre_vnc_tab_get_viewonly (VinagreVncTab *tab) { + g_return_val_if_fail (VINAGRE_IS_VNC_TAB (tab), FALSE); + + return vnc_display_get_read_only (VNC_DISPLAY (tab->priv->vnc)); +} + +gboolean +vinagre_vnc_tab_is_pointer_grab (VinagreVncTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_TAB (tab), FALSE); + + return tab->priv->pointer_grab; +} + +gint +vinagre_vnc_tab_get_original_height (VinagreVncTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_TAB (tab), -1); + + if (VNC_IS_DISPLAY (tab->priv->vnc)) + return vnc_display_get_height (VNC_DISPLAY (tab->priv->vnc)); + else + return -1; +} + +gint +vinagre_vnc_tab_get_original_width (VinagreVncTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_VNC_TAB (tab), -1); + + if (VNC_IS_DISPLAY (tab->priv->vnc)) + return vnc_display_get_width (VNC_DISPLAY (tab->priv->vnc)); + else + return -1; +} + + +typedef struct _VinagrePrefSize { + gint width, height; + gulong sig_id; +} VinagrePrefSize; + +static gboolean +cb_unset_size (gpointer data) +{ + GtkWidget *widget = data; + + gtk_widget_queue_resize_no_redraw (widget); + + return FALSE; +} + +static void +cb_set_preferred_size (GtkWidget *widget, GtkRequisition *req, + gpointer data) +{ + VinagrePrefSize *size = data; + + req->width = size->width; + req->height = size->height; + + g_signal_handler_disconnect (widget, size->sig_id); + g_free (size); + g_idle_add (cb_unset_size, widget); +} + +static void +vinagre_widget_set_preferred_size (GtkWidget *widget, + gint width, + gint height) +{ + VinagrePrefSize *size = g_new (VinagrePrefSize, 1); + + size->width = width; + size->height = height; + size->sig_id = g_signal_connect (widget, "size-request", + G_CALLBACK (cb_set_preferred_size), + size); + + gtk_widget_queue_resize (widget); +} + + +void +vinagre_vnc_tab_original_size (VinagreVncTab *tab) +{ + GtkWindow *window; + g_return_if_fail (VINAGRE_IS_VNC_TAB (tab)); + + window = GTK_WINDOW (vinagre_tab_get_window (VINAGRE_TAB (tab))); + + gtk_window_unmaximize (window); + gtk_window_resize (window, 1, 1); + vinagre_widget_set_preferred_size (GTK_WIDGET (tab), + vinagre_vnc_tab_get_original_width (tab), + vinagre_vnc_tab_get_original_height (tab)); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vinagre-vnc-tab.h vinagre-2.29.1/plugins/vnc/vinagre-vnc-tab.h --- vinagre-2.26.1/plugins/vnc/vinagre-vnc-tab.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vinagre-vnc-tab.h 2009-07-27 12:59:30.000000000 +0100 @@ -0,0 +1,75 @@ +/* + * vinagre-vnc-tab.h + * VNC Tab + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_VNC_TAB_H__ +#define __VINAGRE_VNC_TAB_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_VNC_TAB (vinagre_vnc_tab_get_type()) +#define VINAGRE_VNC_TAB(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_VNC_TAB, VinagreVncTab)) +#define VINAGRE_VNC_TAB_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_VNC_TAB, VinagreVncTab const)) +#define VINAGRE_VNC_TAB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_VNC_TAB, VinagreVncTabClass)) +#define VINAGRE_IS_VNC_TAB(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_VNC_TAB)) +#define VINAGRE_IS_VNC_TAB_CLASS(klass)...(G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_VNC_TAB)) +#define VINAGRE_VNC_TAB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_VNC_TAB, VinagreVncTabClass)) + +typedef struct _VinagreVncTabPrivate VinagreVncTabPrivate; +typedef struct _VinagreVncTab VinagreVncTab; +typedef struct _VinagreVncTabClass VinagreVncTabClass; + + +struct _VinagreVncTab +{ + VinagreTab tab; + VinagreVncTabPrivate *priv; +}; + +struct _VinagreVncTabClass +{ + VinagreTabClass parent_class; +}; + +GType vinagre_vnc_tab_get_type (void) G_GNUC_CONST; + +GtkWidget * vinagre_vnc_tab_new (VinagreConnection *conn, + VinagreWindow *window); + +void vinagre_vnc_tab_send_ctrlaltdel (VinagreVncTab *tab); +void vinagre_vnc_tab_paste_text (VinagreVncTab *tab, + const gchar *text); + +gboolean vinagre_vnc_tab_set_scaling (VinagreVncTab *tab, gboolean active); +gboolean vinagre_vnc_tab_get_scaling (VinagreVncTab *tab); +void vinagre_vnc_tab_set_viewonly (VinagreVncTab *tab, gboolean active); +gboolean vinagre_vnc_tab_get_viewonly (VinagreVncTab *tab); + +gint vinagre_vnc_tab_get_original_width (VinagreVncTab *tab); +gint vinagre_vnc_tab_get_original_height (VinagreVncTab *tab); +void vinagre_vnc_tab_original_size (VinagreVncTab *tab); + +gboolean vinagre_vnc_tab_is_pointer_grab (VinagreVncTab *tab); +G_END_DECLS + +#endif /* __VINAGRE_VNC_TAB_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/plugins/vnc/vnc.ui vinagre-2.29.1/plugins/vnc/vnc.ui --- vinagre-2.26.1/plugins/vnc/vnc.ui 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vnc.ui 2009-10-26 12:19:28.000000000 +0000 @@ -0,0 +1,257 @@ + + + + + + 5 + Reverse Connections + False + True + center-on-parent + True + dialog + False + + + True + vertical + 6 + + + True + vertical + 6 + + + True + 6 + + + True + 6 + gtk-dialog-info + 6 + + + False + False + 0 + + + + + True + 0 + By activating reverse connections you can access machines that are behind a firewall. The remote side is supposed to initiate the connection with you. For further information, checkout the help. + True + + + + + + 1 + + + + + 0 + + + + + True + vertical + 4 + + + _Enable Reverse Connections + True + True + False + True + True + + + 0 + + + + + True + + + True + + + + False + False + 0 + + + + + _Always Enabled + True + True + False + True + True + + + 1 + + + + + 1 + + + + + True + + + True + + + + False + False + 0 + + + + + True + True + + + True + vertical + + + True + 0 + 0 + + + True + + + True + True + 3 + 3 + False + ip_textbuffer + + + + + + + True + 0 + This machine is reachable through the following IP address(es): + + + + + + + + 0 + + + + + True + 0 + label + + + + + + + 1 + + + + + + + True + Connectivity + + + + + 1 + + + + + 2 + + + + + 6 + 1 + + + + + 1 + + + + + True + + + gtk-help + True + True + True + True + + + False + False + 0 + + + + + gtk-close + True + True + True + True + + + False + False + 1 + + + + + False + False + end + 0 + + + + + + button1 + button2 + + + + diff -Nru vinagre-2.26.1/plugins/vnc/vnc.vinagre-plugin.desktop.in vinagre-2.29.1/plugins/vnc/vnc.vinagre-plugin.desktop.in --- vinagre-2.26.1/plugins/vnc/vnc.vinagre-plugin.desktop.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/plugins/vnc/vnc.vinagre-plugin.desktop.in 2009-07-29 18:10:50.000000000 +0100 @@ -0,0 +1,11 @@ +[Vinagre Plugin] +Module=vnc +IAge=1 +_Name=VNC +_Description=VNC support +Authors=Jonh Wendell +Copyright=Copyright © 2009 Jonh Wendell +Website=http://www.bani.com.br +Version=1.0 +Engine=1 +Icon=vinagre diff -Nru vinagre-2.26.1/po/ar.po vinagre-2.29.1/po/ar.po --- vinagre-2.26.1/po/ar.po 2009-03-19 19:29:39.000000000 +0000 +++ vinagre-2.29.1/po/ar.po 2009-09-01 12:16:41.000000000 +0100 @@ -9,10 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: vinagre.HEAD\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-17 14:17+0000\n" -"PO-Revision-Date: 2009-02-11 21:21+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-08-31 20:43+0200\n" +"PO-Revision-Date: 2009-08-31 20:43+0300\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" @@ -21,149 +20,144 @@ "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-Generator: Virtaal 0.3.0\n" +"X-Generator: Virtaal 0.4.0\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_عن" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "م_ساعدة" #: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 msgid "Access remote desktops" -msgstr "مكّن وصول سطح المكتب البعيد" +msgstr "اتصل بسطح مكتب بعيد" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "عارض سطوح مكتب بعيدة" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "التصريح مطلوب" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "كل الحقول أعلاه ضرورية" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "الاستيثاق مطلوب" -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "خيارات الاتصال" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "الاتصال" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "المجلد" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "الواجهة" +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 +msgid "Bookmarks" +msgstr "العلامات" -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "خيارات" +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "الاتصال" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "خيارات الاتصال" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "المجلد" -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "المجلد الوالد" +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 +msgid "Host:" +msgstr "المستضيف:" -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "بأي خادوم تريد الاتصال؟ " +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "الواجهة" -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "" +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "الخيارات" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 -msgid "Bookmarks" -msgstr "العلامات" +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "المجلد الأم" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 -msgid "Host:" -msgstr "المضيف:" - -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "التفضيلات" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "إذا ما علينا عرض الألسنة حتى عند وجود اتصال نشط واحد فقط" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "إذا ما علينا عرض مسرعات القوائم (مفاتيح الاختصار)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "بأي جهاز تريد الاتصال؟" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "أظهر الألسن _دائما" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 -#, fuzzy +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" -msgstr "فشل التصريح" +msgstr "ا_ستوثق" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_ملء الشاشة" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "الم_ضيف:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "الا_سم:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_كلمة السر:" -#: ../data/vinagre.glade.h:22 -msgid "_Remember this credential" -msgstr "_تذكّر الاستيثاق هذا" +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "البرو_توكول:" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "ال_قياس" +#: ../data/vinagre.ui.h:21 +msgid "_Remember this credential" +msgstr "_تذكّر هذا الاعتماد" -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "أ_ظهر اختصارات القائمة" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "اسم ال_مستخدم:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "ا_عرض فقط" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "الملحقات النشِطة" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "\"المضيف\" او \"المضيف:العرض\" او \"المضيف::المنفذ\"" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"قائمة الملحقات النشطة. تضم \"Location\" الملحقات النشطة. انظر الملف .vinagre-" +"plugin، للحصول على\"Location\" ملحق معين." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "العدد الأقصى من عناصر التاريخ في مربع الاتصال" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " "and will not be sent to the remote host." msgstr "" "ضع \"خطأ\" لتعطيل اختصارات القائمة.ضع \"صحيح\" لتفعيلها. لاحظ أنه عند " -"تفعيلها، ستعترض هذه المفاتيح من القائمة و لن ترسل إلى المضيف البعيد." +"تفعيلها، ستعترض هذه المفاتيح من القائمة و لن ترسل إلى المستضيف البعيد." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -171,28 +165,37 @@ "ضع \"صح\" لعرض الألسنة دائما. ضع \"خطأ\" لعرض الالسنة فقط عند وجود اكثر من " "اتصال نشط." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." -msgstr "يخصص العدد الأقصى للعناصر في قائمة الرفض للمضيف." +msgstr "يخصص العدد الأقصى للعناصر في قائمة الرفض للمستضيف." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "مدير عناوين \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " "to share the desktop with the other clients." msgstr "" -"عند الاتصال بمضيف، يمكن للعميل طلب إبقاء العملاء الآخرين متصلين او إيقاف " +"عند الاتصال بمستضيف، يمكن للعميل طلب إبقاء العملاء الآخرين متصلين او إيقاف " "الاتصالات السابقة. اضبط القيمة على \"صحيح\" لمشاركة سطح المكتب مع العملاء " "الآخرين." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "إذا ما كان علينا ترك العملاء الآخرين متصلين" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "إذا ما علينا عرض الألسنة حتى عند وجود اتصال نشط واحد فقط" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "إذا ما علينا عرض مسرعات القوائم (مفاتيح الاختصار)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "ملف (VNC) لسطح المكتب البعيد" @@ -201,90 +204,267 @@ msgid "Remote Desktop Connection" msgstr "اتصال سطح مكتب بعيد" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "اتصل بطرفيات يونكس\\ لينكس" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "المنفذ:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "دعم SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "قيمة سيئة للعلم 'shared': %d. من المفترض أن يكون 0 أو 1. تجاهله." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "فعّل النمط المقيس" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "خيارات VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "اعرض خيارات VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "اتصل بأجهزة يونكس\\لينكس و ويندوز وغيرها." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "تعذر تحليل الملف." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "الملف ليس ملف VNC: لا يحتوي المجموعة \"connection\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "الملف ليس ملف VNC: لا يحتوي المفتاح \"host\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "خيارات VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "ا_عرض فقط" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "ال_قياس" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "ملفات VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "اسم سطح المكتب:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "الأبعاد:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "خطأ في الاتصال بالمستضيف." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "طريقة استيثاق المستضيف %s غير مدعومة. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "الاستيثاق غير مدعوم" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "خطأ في الاستيثاق" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "تحتاج لاسم مستخدم للوصول إلى هذا الجهاز." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "تحتاج لكلمة سر للوصول إلى هذا الجهاز." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "الم_قياس" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "لائم حجم شاشة الجهة المتصل بها مع حجم النافذة الحالية" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "لا يستخدم أحداث الفأرة ولوحة المفاتيح" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "الحجم الأ_صلي" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "يسوي حجم نافذة سطح المكتب البعيد" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "أرسل Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "يُرسل Ctrl+Alt+Del للجهاز البعيد" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "القياس" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "قراءة فقط" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"القياس غير مدعوم في هذا التثبيت.\n" +"\n" +"اقرا ملف README (المقدم مع فيناجر) لمعرفة كيفية تفعيل هذه الميزة." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "دعم VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" -msgstr "قائمة للوصول السريع للآلات البعيدة" +msgstr "قائمة للوصول السريع للأجهزة البعيدة" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" -msgstr "مصنع بريمجات فيناغر" +msgstr "مصنع بريمجات فيناجر" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" -msgstr "تعذر تشغيل فيناغر:" +msgstr "تعذر تشغيل فيناجر:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" -msgstr "افتح عارض سطح المكتب البعيد" +msgstr "افتح عارض سطوح المكتب البعيدة" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "اطلع على علاماتك" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "البروتوكول %s غير مدعوم." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "خطأ في ابتداء العلامات: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "خطأ مجهول" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "خطأ في ابتداء العلامات: يبدو الملف فارغًا" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "خطأ في ابتداء العلامات: ليس الملف علامة موقع قيناغر" +msgstr "خطأ في ابتداء العلامات: ليس الملف علامة موقع فيناجر" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "خطأ في حفظ العلامات: فشل في إنشاء بناء XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "خطأ في حفظ العلامات: فشل في ابتداء بناء XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "خطأ في حفظ العلامات: فشل في إنهاء بناء XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "خطأ في حفظ العلامات: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "خطأ في نقل العلامات: فشل في إنشاء بناء XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "خطأ في نقل العلامات: فشل في ابتداء بناء XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "خطأ في نقل العلامات: فشل في إنهاء بناء XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "خطأ في نقل العلامات: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "خطأ في نقل العلامات: ملحقة VNC غير مفعلة" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "فشل في إنشاء الدليل" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -292,62 +472,88 @@ "نقل ملف العلامات إلى الهيئة الجديدة. من المفترض أن تنفّذ هذه العملية مرة " "واحدة فقط." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "خطأ في فتح ملف العلامات: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "ألغي الانتقال" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "تغذرت إزالة ملف العلامات القديم" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "المجلد الجذر" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "اسم غير صحيح لهذا المجال" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "أمتاكد من رغبتك بإزالة %s من العلامات؟" +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "الاسم \"%s\" مستخدم في هذا المجلد سابقا. فضلا استخدم اسما آخر." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "اسم غير صحيح لهذا العنصر" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(البروتوكول: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "أمتاكد من رغبتك بإزالة %s من العلامات؟" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "أأحذف المجلد؟" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "لاحظ أن كل المجلدات الفرعية والعناصر ستحذف أيضا." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "أأحذف العنصر؟" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" -msgstr "خطأ إزالة العلامة: لم توجد المدخلة" +msgstr "خطأ أثناء إزالة العلامة: لم توجد المدخلة" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "مجلد جديد" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "اختر الملف" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "التنسيقات المتوفّرة" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "لا توجد ملفات مدعومة" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"لا يوفر أي من الملحقات النشطة ملفات مدعومة لفتحها. نشط المزيد من الملحقات ثم " +"أعد المحاولة." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "لا يمكن فتح هذا الملف" @@ -357,67 +563,65 @@ msgstr[4] "لا يمكن فتح هذه الملفات" msgstr[5] "لا يمكن فتح هذه الملفات" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "تعذّر إيجاد البروتوكول النشط في قائمة البروتوكولات." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "خطأ في حفظ ملف التاريخ: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "اختر خادوم VNC " +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "اختر سطح مكتب بعيد" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "البروتوكول %s غير مدعوم." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." -msgstr "تغذر فتح الملف." - -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "تغذر تحليل الملف." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "قيمة سيئة للعلم 'shared': %d. من المفترض أن يكون 0 أو 1. تجاهله." +msgstr "تعذر فتح الملف." -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "تغذر إيجاد عنوان المضيف في الملف." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "لم تتعرف أي من الملحقات على الملف." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "عملية غير صحيحة" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "البيانات المتلقاة من عملية السحب والإلقاء غير صحيحة." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" -msgstr "المضيفون المجاورون" +msgstr "المستضيفون المجاورون" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "افتح فيناجر في نمط ملء الشاشة" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "يفتح ملف .vnc" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 +msgid "Create a new toplevel window in an existing instance of vinagre" +msgstr "أنشئ نافذة عالية المستوى في حدوث سابق لفيناجر" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "افتح ملف يفهمه فيناجر" -#: ../src/vinagre-main.c:53 +#: ../vinagre/vinagre-main.c:70 msgid "filename" msgstr "اسم الملف" -#: ../src/vinagre-main.c:56 -msgid "Create a new toplevel window in an existing instance of vinagre" -msgstr "أنشئ نافذة عالية المستوى في حدوث سابق لفيناغر" - -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[خادوم:منفذ]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "حصل الخطأ التالي:" @@ -428,338 +632,348 @@ msgstr[5] "حصلت الأخطاء التالية:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- عميل VNC لجنوم." +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- عارض سطوح مكتب بعيدة" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "شغّل 'vinagre --help' لرؤية قائمة كاملة لخيارات سطر الأوامر." -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" -msgstr "فشل حل اسم مضيف avahi : %s\n" +msgstr "فشل حل اسم مستضيف avahi‏ : %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 #, c-format -msgid "Failed to browse for hosts: %s\n" -msgstr "فشل الاستعراض عن مضيفين: %s\n" +msgid "Plugin %s has already registered a browser for service %s." +msgstr "سجّلت الملحقة %s مستعرضا للخدمة %s من قبل." -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:209 #, c-format -msgid "Connection to host %s was closed." -msgstr "أغُلق الاتصال بالمضيف %s" +msgid "Failed to add mDNS browser for service %s." +msgstr "فشلت إضافة المستعرض mDNS للخدمة %s." -#: ../src/vinagre-notebook.c:170 -msgid "Connection closed" -msgstr "أغلق الاتصال" - -#: ../src/vinagre-notebook.c:194 -msgid "Connecting..." -msgstr "يجري الاتصال..." +#: ../vinagre/vinagre-mdns.c:225 +#, c-format +msgid "Failed to browse for hosts: %s\n" +msgstr "فشل الاستعراض عن مستضيفين: %s\n" -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 -msgid "Close connection" -msgstr "اغلق الاتصال" +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "فشل بدء المستعرض mDNS‏: %s\n" -#: ../src/vinagre-prefs.c:169 -msgid "Cannot initialize preferences manager." -msgstr "لا يمكن تشغيل مدير التفضيلات." +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "أغُلق الاتصال بالمستضيف %s" -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "خطأ في الاتصال بالمضيف." +#: ../vinagre/vinagre-notebook.c:463 +msgid "Connection closed" +msgstr "أغلق الاتصال" -#: ../src/vinagre-tab.c:354 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 #, c-format -msgid "Authentication to host %s has failed" -msgstr "فشل التصريح للمضيف %s" +msgid "Authentication to host %s has failed" +msgstr "فشل استيثاق للمستضيف %s" -#: ../src/vinagre-tab.c:360 +#: ../vinagre/vinagre-notebook.c:488 msgid "Authentication failed" msgstr "فشل التصريح" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "طريقة التصريح للمضيف %s غير مدعومة. (%u)" +#: ../vinagre/vinagre-notebook.c:525 +msgid "Connecting..." +msgstr "يتصل..." -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "التصريح غير مدعوم" +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 +msgid "Close connection" +msgstr "أغلق الاتصال" -#: ../src/vinagre-tab.c:460 -msgid "Error saving recent connection." -msgstr "خطأ أثناء حفظ الاتصال الأخير" +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "مدير الملحقات" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "ملحقة" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "مفعّلة" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "ا_ضبط" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_نشّط" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "ن_شط الكل" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_عطّل الكل" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_عنْ الملحقة" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "ا_ضبط الملحقة" -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "خطأ في حفظ الاستيثاق على حلقة المفاتيح." +#: ../vinagre/vinagre-prefs.c:217 +msgid "Cannot initialize preferences manager." +msgstr "تعذّر بدء مدير التفضيلات." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -#, fuzzy -msgid "Authentication error" -msgstr "فشل التصريح" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "غادر ملء الشاشة" -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "" +#: ../vinagre/vinagre-tab.c:495 +msgid "Error saving recent connection." +msgstr "خطأ أثناء حفظ الاتصال الأخير." -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "" +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "خطأ في حفظ الاعتماد في حلقة المفاتيح." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "صغّر النافذة" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "تعذّر أخذ لقطة شاشة للاتصال." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "القياس" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "احفظ لقطة الشاشة" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "قراءة فقط" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "لقطة شاشة ل‍ %s" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "خذ لقطة للشاشة" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "خطأ أثناء حفظ لقطة الشاشة" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "أرسل Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "تعذّرت معرفة خاصية الخدمة: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "اسم سطح المكتب:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "تعذّر إنشاء الاتصال: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "المنفذ:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "تعذّر قبول قناة الدفق: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "الأبعاد:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "تعذّرت معرفة اسم المتراسل: %s" -#: ../src/vinagre-tab.c:1130 -#, fuzzy -msgid "Could not get a screenshot of the connection." -msgstr "خذ لقطة شاشة للاتصال النشط" +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "تعذّر جلب الأفاتر: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "لقطة شاشة ل‍ %s" +msgid "%s wants to share his desktop with you." +msgstr "يريد %s أن يشارك سطح مكتبه معك." -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "احفظ لقطة الشاشة" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"القياس غير مدعوم في هذا التثبيت.\n" -"\n" -"اقرا ملف README (المقدم مع فيناغر) لمعرفة كيفية تفعيل هذه الميزة." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "دعوة لمشاركة سطح المكتب" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" -msgstr "آ_لة" +msgstr "_جهاز" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" -msgstr "_حرّر" +msgstr "_تحرير" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" -msgstr "ا_عرض" +msgstr "_عرض" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" -msgstr "_علامات مواقع" +msgstr "ال_علامات" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" -msgstr "اتصل بآلة بعيدة" +msgstr "اتصل بجهاز بعيد" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" -msgstr "افتح ملف .VNC" +msgstr "افتح ملف ‪.VNC‬" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "اخرج من البرنامج" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" -msgstr "يحرر تفضيلات التطبيق" +msgstr "حرر تفضيلات التطبيق" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "ا_فتح العلامة" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" -msgstr "اتصل بهذه الآلة" +msgstr "اتصل بهذا الجهاز" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_حرر العلامة" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "حرر تفاصيل العلامة المحددة" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "ا_حذف من العلامات" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "احذف الاتصالات المنتقاة حاليا من العلامات" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "مجلد _جديد" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "أنشئ مجلدا جديدا" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_المحتويات" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" -msgstr "افتح كتيّب فيناغر" +msgstr "افتح كتيّب فيناجر" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" -msgstr "حول هذا التطبيق" +msgstr "عن هذا التطبيق" + +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "شريط الأ_دوات" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "اعرض أو أخفِ شريط الأدوات" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "شريط ال_حالة" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "اعرض أو اخف شريط الحالة" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "اللوح_الجانبي" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "اعرض او أخف اللوح الجانبي" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" -msgstr "غلق الاتصال الحالي" +msgstr "أغلق الاتصال الحالي" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "أغلق ال_كل" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "أغلق كل الاتصالات النشطة" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" -msgstr "أ_ضف لالعلامات" +msgstr "أ_ضف إلى العلامات" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" -msgstr "أضِف الاتصال الحالي لالعلامات" +msgstr "أضِف الاتصال الحالي إلى العلامات" + +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "خذ لقطة للشاشة" -#: ../src/vinagre-ui.h:86 +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "خذ لقطة شاشة للاتصال النشط" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "ارسل Ctrl+Alt+Del للاتصال النشط" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "اعرض الاتصال الحالي في نسق كامل الشاشة" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "الحجم الأ_صلي" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "يسوي حجم نافذة سطح المكتب البعيد" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "الم_قياس" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "لائم حجم شاشة الجهة المتصل بها مع حجم النافذة الحالية" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_قراءة فقط" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "عطل الفارة و لوحة المفاتيح" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "شريط الأ_دوات" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "اعرض أو أخفِ شريط الأدوات" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "شريط ال_حالة" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "اعرض أو اخف شريط الحالة" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "اللوح_الجانبي" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "اعرض او أخف اللوح الجانبي" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "صودف خطأ:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "فيناغر هو عميل VNC لسطح مكتب جنوم" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "تعذّر تحميل ملف واجهة المستخدم: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "فيناجر هو عارض سطوح مكتب عن بعد لجنوم" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 "" -"فيناغر برنامج حر؛ بإمكانك إعادة توزيعه و/أو تعديله تحت شروط الرخصة العامة " +"فيناجر برنامج حر؛ بإمكانك إعادة توزيعه و/أو تعديله تحت شروط الرخصة العامة " "لجنو كما نشرتها مؤسسة البرمجيات الحرة؛ إما الإصدارة 2 للرخصة أو (حسب رأيك) " "أي إصدارة لاحقة." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre 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 "" -"يوزّع فيناغر على أمل أن يكون مفيدا لمن يستخدمه دون أدنى ضمان؛ ولا حتى الضمان " +"يوزّع فيناجر على أمل أن يكون مفيدا لمن يستخدمه دون أدنى ضمان؛ ولا حتى الضمان " "الضمني بالصلاحية التسويقية أو توافقه مع أي استخدام محدد. انظر رخصة جنو " "العامة مزيد من التفاصيل. " -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -767,32 +981,65 @@ "من المفترض أن تكون قد استلمت نسخة من رخصة جنو العامة مع البرنامج؛ في حال عدم " "استلامك، يمكنك تصفح ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" -msgstr "جهاد عفيفي أسامة خالد " +msgstr "" +"فريق عربآيز للترجمة http://www.arabeyes.org:\n" +"جهاد عفيفي\t\n" +"أسامة خالد\t\n" +"خالد حسني\t" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "موقع فيناجر" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "لم يمكن دمج vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "الاتّصالات ال_حديثة" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "افتح %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "اضغط Ctrl+Alt لتحرير المؤشر" +#~ msgid "Connection" +#~ msgstr "الاتصال" + +#~ msgid "Folder" +#~ msgstr "المجلد" + +#~ msgid "host or host:display or host::port" +#~ msgstr "\"المضيف\" او \"المضيف:العرض\" او \"المضيف::المنفذ\"" + +#~ msgid "Supported formats" +#~ msgstr "التنسيقات المتوفّرة" + +#~ msgid "Choose a VNC Server" +#~ msgstr "اختر خادوم VNC " + +#~ msgid "Could not find the host address in the file." +#~ msgstr "تغذر إيجاد عنوان المضيف في الملف." + +#~ msgid "Opens a .vnc file" +#~ msgstr "يفتح ملف .vnc" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- عميل VNC لجنوم." + +#~ msgid "Minimize window" +#~ msgstr "صغّر النافذة" + +#~ msgid "_Read only" +#~ msgstr "_قراءة فقط" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "اضغط Ctrl+Alt لتحرير المؤشر" #~ msgid "Editing a bookmark" #~ msgstr "تحرير علامة الموقع" diff -Nru vinagre-2.26.1/po/as.po vinagre-2.29.1/po/as.po --- vinagre-2.26.1/po/as.po 2009-03-17 00:19:13.000000000 +0000 +++ vinagre-2.29.1/po/as.po 2009-09-30 17:53:19.000000000 +0100 @@ -6,21 +6,21 @@ msgstr "" "Project-Id-Version: vinagre.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-01 18:45+0000\n" -"PO-Revision-Date: 2009-03-15 22:10+0530\n" -"Last-Translator: Amitakhya Phukan \n" -"Language-Team: Assamese \n" +"POT-Creation-Date: 2009-08-25 12:02+0000\n" +"PO-Revision-Date: 2009-09-18 14:18+0530\n" +"Last-Translator: \n" +"Language-Team: Assamese <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 0.3\n" +"X-Generator: Lokalize 0.2\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "বিষয়ে (_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "সহায়তা (_H)" @@ -29,161 +29,175 @@ msgstr "দূৰবৰ্তী ডেস্কটপৰ সৈতে সংযোগ কৰক" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "দূৰবৰ্তী ডেস্কটপ প্ৰদৰ্শন ব্যৱস্থা" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "পৰিচয় প্ৰমাণ কৰা আবশ্যক" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "সংযোগ সংক্ৰান্ত বিকল্প" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "সংযোগ" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "ফোল্ডাৰ" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "প্ৰেক্ষাপট" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "বিকল্প" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "ঊৰ্ধ্বতন ফোল্ডাৰ" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "আপুনি কোন মেশিনৰ সৈতে সংযোগ স্থাপন কৰিবলৈ বিচাৰে ?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "উপৰোক্ত সকলো ক্ষেত্ৰত মান পূৰণ কৰা আবশ্যক" +#: ../data/vinagre.ui.h:1 +#| msgid "All fields above are mandatory" +msgid "All fields above are mandatory" +msgstr "উপৰোক্ত সকলো ক্ষেত্ৰত মান পূৰণ কৰা আৱশ্যক" + +#: ../data/vinagre.ui.h:2 +#| msgid "Authentication is required" +msgid "Authentication is required" +msgstr "পৰিচয় প্ৰমাণ কৰা আৱশ্যক" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "পত্ৰচিহ্ন" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +#| msgid "Connecting..." +msgid "Connection" +msgstr "সংযোগ স্থাপন কৰা হৈছে" + +#: ../data/vinagre.ui.h:5 +#| msgid "Connection options" +msgid "Connection options" +msgstr "সংযোগ সংক্ৰান্ত বিকল্প" + +#: ../data/vinagre.ui.h:6 +#| msgid "New Folder" +msgid "Folder" +msgstr "নতুন ফোল্ডাৰ" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "গৃহস্থ:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +#| msgid "Interface" +msgid "Interface" +msgstr "সংযোগক্ষেত্ৰ" + +#: ../data/vinagre.ui.h:9 +#| msgid "Options" +msgid "Options" +msgstr "বিকল্প" + +#: ../data/vinagre.ui.h:10 +#| msgid "Parent Folder" +msgid "Parent Folder" +msgstr "ঊৰ্ধ্বতন ফোল্ডাৰ" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "পছন্দ" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "অকল এটা সক্ৰিয় সংযোগ থাকিলে টেব প্ৰদৰ্শন কৰা হ'ব নে নহয়" +#: ../data/vinagre.ui.h:12 +#| msgid "Which machine do you want to connect to?" +msgid "Which machine do you want to connect to?" +msgstr "কোন যন্ত্ৰৰ সৈতে সংযোগ স্থাপন কৰিবলৈ আপুনি ইচ্ছুক নে ?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "মেনু এক্‌ছেলেৰেটৰ (শৰ্টকাট-চাবি) প্ৰদৰ্শন কৰা হ'ব নে নহয়" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "সদায়ে টেব প্ৰদৰ্শন কৰা হ'ব (_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "পৰিচয় প্ৰমাণ (_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" -msgstr "সম্পূৰ্ণ পৰ্দায় প্ৰদৰ্শন (_F)" +msgstr "সম্পূৰ্ণ পৰ্দাত প্ৰদৰ্শন (_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "গৃহস্থ:(_H)" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "নাম :(_N)" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "গুপ্তশব্দ (_P):" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "প্ৰোটোকল: (_P)" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "এই পৰিচয় মনত ৰখা হ'ব (_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "মাপ নিৰ্ণয় (_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "মেনুৰ শৰ্ট-কাট প্ৰদৰ্শন কৰা হ'ব (_S)" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "ব্যৱহাৰকৰ্তাৰ নাম: (_U)" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "অকল প্ৰদৰ্শন (_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "সক্ৰিয় প্লাগ-ইন" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "host অথবা host:display অথবা host::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"সক্ৰিয় প্লাগ-ইনৰ তালিকা । ইয়াত সক্ৰিয় প্লাগ-ইনৰ \"অৱস্থান\" অন্তৰ্ভুক্ত আছে । 
কোনো সুনিৰ্দিষ্ট " +"প্লাগ-ইনৰ \"অৱস্থান\" জনাৰ বাবে .vinagre-plugin নথিপত্ৰ চাওক ।" -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "সংযোগেৰ সম্বাদ বাকচত প্ৰদৰ্শনযোগ্য পূৰ্ববৰ্তী তথ্যৰ সৰ্বাধিক তালিকা" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " "and will not be sent to the remote host." msgstr "" -"মেনু শৰ্ট-কাট নিষ্ক্ৰিয় কৰাৰ বাবে \"false\" নিৰ্ধাৰণ কৰক । শৰ্ট-কাট সক্ৰিয় কৰাৰ বাবে " -"\"true\" নিৰ্ধাৰণ কৰক । উল্লেখ্য, এইসমূহ সক্ৰিয় কৰা হ'লে, মেনু দ্বাৰা এই কি-সমূহৰ কৰ্ম " -"চিনাক্ত আৰু গ্ৰহণ কৰা হ'ব আৰু দূৰবৰ্তী গৃহস্থকে প্ৰৰণ কৰা ন'হ'ব ।" +"মেনু শৰ্ট-কাট নিষ্ক্ৰিয় কৰাৰ বাবে \"false\" নিৰ্ধাৰণ কৰক । শৰ্ট-কাট সক্ৰিয় কৰাৰ " +"বাবে \"true\" নিৰ্ধাৰণ কৰক । উল্লেখ্য, এইসমূহ সক্ৰিয় কৰা হ'লে, মেনু দ্বাৰা এই কি-" +"সমূহৰ কৰ্ম চিনাক্ত আৰু গ্ৰহণ কৰা হ'ব আৰু দূৰবৰ্তী গৃহস্থকে প্ৰৰণ কৰা ন'হ'ব ।" -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." msgstr "" -"মান \"true\" নিৰ্ধাৰণ কৰা হ'লে সদায়ে টেব প্ৰদৰ্শন কৰা হ'ব । অকল একাধিক সক্ৰিয় " -"সংযোগ উপস্থিত থাকিলে টেব প্ৰদৰ্শনৰ বাবে মান \"false\" নিৰ্ধাৰণ কৰক ।" +"মান \"true\" নিৰ্ধাৰণ কৰা হ'লে সদায়ে টেব প্ৰদৰ্শন কৰা হ'ব । অকল একাধিক সক্ৰিয় " +"সংযোগ উপস্থিত থাকিলে টেব প্ৰদৰ্শনৰ বাবে মান \"false\" নিৰ্ধাৰণ কৰক ।" -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." -msgstr "গৃহস্থ ড্ৰপ-ডাউন নিবেশত প্ৰদৰ্শনযোগ্য তথ্যৰ সৰ্বাধিক সংখ্যা ।" +msgstr "গৃহস্থ ড্ৰপ-ডাউন নিবেশত প্ৰদৰ্শনযোগ্য তথ্যৰ সৰ্বাধিক সংখ্যা ।" -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr " \"vnc://\" URL ৰ হেন্ডলাৰ" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " "to share the desktop with the other clients." msgstr "" -"গৃহস্থেৰ সৈতে সংযোগ স্থাপন কৰাৰ সময়, গ্ৰাহক প্ৰণালী দ্বাৰা সেৱকত অন্যান্য সংযুক্ত গ্ৰাহকৰ সৈতে " -"সংযোগ বিচ্ছিন্ন কৰিবলৈ অথবা নকৰিবলৈ অনুৰোধ কৰা যেতে পাৰে । অন্যান্য গ্ৰাহকৰ সৈতে ডেস্কটপ যৌথৰূপে " -"ব্যৱহাৰৰ বাবে মান true নিৰ্ধাৰণ কৰক ।" +"গৃহস্থেৰ সৈতে সংযোগ স্থাপন কৰাৰ সময়, গ্ৰাহক প্ৰণালী দ্বাৰা সেৱকত অনেন্য সংযুক্ত " +"গ্ৰাহকৰ সৈতে সংযোগ বিচ্ছিন্ন কৰিবলৈ অথবা নকৰিবলৈ অনুৰোধ কৰা যেতে পাৰে । অনেন্য " +"গ্ৰাহকৰ সৈতে ডেস্কটপ যৌথৰূপে ব্যৱহাৰৰ বাবে মান true নিৰ্ধাৰণ কৰক ।" -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" -msgstr "অন্যান্য গ্ৰাহকৰ সংযোগ অপৰিবৰ্তিত থাকিব নে নহয়" +msgstr "অনেন্য গ্ৰাহকৰ সংযোগ অপৰিবৰ্তিত থাকিব নে নহয়" + +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "অকল এটা সক্ৰিয় সংযোগ থাকিলে টেব প্ৰদৰ্শন কৰা হ'ব নে নহয়" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "মেনু এক্‌ছেলেৰেটৰ (শৰ্টকাট-চাবি) প্ৰদৰ্শন কৰা হ'ব নে নহয়" #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" @@ -193,533 +207,767 @@ msgid "Remote Desktop Connection" msgstr "দূৰবৰ্তী ডেস্কটপ সংযোগ" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux টাৰ্মিনেল ব্যৱহাৰ কৰক" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "পোৰ্ট:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH সমৰ্থন ব্যৱস্থা" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"'shared' শীৰ্ষক ফ্লেগৰ মান সঠিক নহয়: %d । এই ক্ষেত্ৰত 0 (০) অথবা 1 (১) মান হোৱা " +"উচিত । উল্লিখিত মান উপেক্ষা কৰা হ'ব ।" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Enable scaled mode" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC বিকল্প:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC বিকল্প দেখুৱাওক" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows আৰু অনেন্য যন্ত্ৰ ব্যৱহাৰ কৰক ।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "নথিপত্ৰ পাৰ্স কৰিবলৈ ব্যৰ্থ ।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "এইটো VNC নথিপত্ৰ নহয়: \"connection\" দলস অনুপস্থিত" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "এইটো VNC নথিপত্ৰ নহয়: \"host\" চাবি অনুপস্থিত" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC সংক্ৰান্ত বিকল্প" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "অকল প্ৰদৰ্শন (_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "মাপ নিৰ্ণয় (_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC-ৰ নথিপত্ৰ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "ডেস্কটপৰ নাম:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "মাত্ৰা:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "গৃহস্থৰ সৈতে সংযোগ স্থাপনত ত্ৰুটি হৈছে" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +#| msgid "Authentication method to host %s is unsupported. (%u)" +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "গৃহস্থ %s-ৰ সৈতে পৰিচয় প্ৰমাণৰ পদ্ধতি সমৰ্থিত নহয় । (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "অনুমোদনৰ পদ্ধতি সমৰ্থিত নহয়" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "অনুমোদন সংক্ৰান্ত সমস্যা" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "এই যন্ত্ৰ ব্যৱহাৰৰ বাবে ব্যৱহাৰকৰ্তাৰ নাম প্ৰয়োগ কৰা আৱশ্যক ।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "এই যন্ত্ৰ ব্যৱহাৰৰ বাবে গুপ্তশব্দ প্ৰয়োগ কৰা আৱশ্যক ।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "মাপ নিৰ্ধাৰণ (_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +#| msgid "Fit the remote screen into the current window size" +msgid "Fits the remote screen into the current window size" +msgstr "দূৰবৰ্তী পৰ্দা বৰ্তমান উইন্ডোৰ মাপ অনুযায়ী নিৰ্ধাৰণ কৰা হ'ব" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +#| msgid "Disable mouse and keyboard" +msgid "Does not send mouse and keyboard events" +msgstr "মাউছ আৰু চাবিৰ ফলকৰ পৰা উৎপন্ন ঘটনা পঠিওৱা ন'হ'ব" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "মূল মাপ (_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "দূৰবৰ্তী ডেস্কটপৰ মাপ অনুযায়ী সংযোগক্ষেত্ৰৰ মাপ নিৰ্ধাৰণ কৰিবলৈ ব্যৱহৃত হয়" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del প্ৰৰণ কৰা হ'ব" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +#| msgid "Send Ctrl+Alt+Del to active connection" +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "দূৰবৰ্তী যন্ত্ৰলৈ Ctrl+Alt+Del সংকেত পঠিওৱা হয়" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "মাপ নিৰ্ধাৰণ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "অকল পাঠযোগ্য" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"বৰ্তমান সংস্থাপনৰ ক্ষেত্ৰত মাপ নিৰ্ধাৰণ সমৰ্থিত নহয় ।\n" +"\n" +"এই বৈশিষ্ট্য সক্ৰিয় কৰাৰ প্ৰণালী সম্বন্ধে জনাৰ বাবে (Vinagre-ৰ সৈতে উপলব্ধ) README " +"নথিপত্ৰ পঢ়ক ।" + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC সমৰ্থন" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" -msgstr "দূৰবৰ্তী মেশিনৰ সৈতে দ্ৰুত সংযোগ স্থাপনৰ মেনু" +msgstr "দূৰবৰ্তী যন্ত্ৰৰ সৈতে দ্ৰুত সংযোগ স্থাপনৰ মেনু" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre এপলেট কলঘৰ" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "vinagre চলাবলৈ ব্যৰ্থ:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "দূৰবৰ্তী ডেস্কটপ প্ৰদৰ্শন ব্যৱস্থা আৰম্ভ কৰক" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "পত্ৰচিহ্ন প্ৰয়োগ কৰক" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "প্ৰোটোকল %s সমৰ্থিত নহয়" + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "পত্ৰচিহ্ন আৰম্ভ কৰিবলৈ ত্ৰুটি হৈছে: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "অজ্ঞাত ত্ৰুটি" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" -msgstr "পত্ৰচিহ্ন প্ৰাৰম্ভ কৰিবলৈ ব্যৰ্থ: নথিপত্ৰটি সম্ভবত ৰিক্ত" +msgstr "পত্ৰচিহ্ন প্ৰাৰম্ভ কৰিবলৈ ব্যৰ্থ: নথিপত্ৰটি সম্ভৱত ৰিক্ত" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "পত্ৰচিহ্ন প্ৰাৰম্ভ কৰিবলৈ ব্যৰ্থ: এটি vinagre পত্ৰচিহ্ন নথিপত্ৰ নহয়" +msgstr "পত্ৰচিহ্ন প্ৰাৰম্ভ কৰিবলৈ ব্যৰ্থ: এইটো vinagre পত্ৰচিহ্ন নথিপত্ৰ নহয়" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" -msgstr "পত্ৰচিহ্ন সংৰক্ষণ কৰিবলৈ ব্যৰ্থ: XML বিন্যাস গঠন কৰিবলৈ ব্যৰ্থ" +msgstr "পত্ৰচিহ্ন সংৰক্ষণ কৰিবলৈ ব্যৰ্থ: XML বিনেস গঠন কৰিবলৈ ব্যৰ্থ" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" -msgstr "পত্ৰচিহ্ন সংৰক্ষণ কৰিবলৈ ব্যৰ্থ: XML বিন্যাস আৰম্ভ কৰিবলৈ ব্যৰ্থ" +msgstr "পত্ৰচিহ্ন সংৰক্ষণ কৰিবলৈ ব্যৰ্থ: XML বিনেস আৰম্ভ কৰিবলৈ ব্যৰ্থ" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" -msgstr "পত্ৰচিহ্ন সংৰক্ষণ কৰিবলৈ ব্যৰ্থ: XML বিন্যাস নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ" +msgstr "পত্ৰচিহ্ন সংৰক্ষণ কৰিবলৈ ব্যৰ্থ: XML বিনেস নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "পত্ৰচিহ্ন সংৰক্ষণে ত্ৰুটি হৈছে: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" -msgstr "পত্ৰচিহ্ন মাইগ্ৰেট কৰিবলৈ ব্যৰ্থ: XML বিন্যাস গঠন কৰিবলৈ ব্যৰ্থ" +msgstr "পত্ৰচিহ্ন মাইগ্ৰেট কৰিবলৈ ব্যৰ্থ: XML বিনেস গঠন কৰিবলৈ ব্যৰ্থ" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" -msgstr "পত্ৰচিহ্ন মাইগ্ৰেট কৰিবলৈ ব্যৰ্থ: XML বিন্যাস আৰম্ভ কৰিবলৈ ব্যৰ্থ" +msgstr "পত্ৰচিহ্ন মাইগ্ৰেট কৰিবলৈ ব্যৰ্থ: XML বিনেস আৰম্ভ কৰিবলৈ ব্যৰ্থ" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" -msgstr "পত্ৰচিহ্ন মাইগ্ৰেট কৰিবলৈ ব্যৰ্থ: XML বিন্যাস নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ" +msgstr "পত্ৰচিহ্ন মাইগ্ৰেট কৰিবলৈ ব্যৰ্থ: XML বিনেস নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "পত্ৰচিহ্ন মাইগ্ৰেট কৰিবলৈ সমস্যা: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +#| msgid "Error while migrating bookmarks: %s" +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "পত্ৰচিহ্ন মাইগ্ৰেট কৰিবলৈ সমস্যা: VNC প্লাগ-ইন সক্ৰিয় নহয়" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "পঞ্জিকা নিৰ্মাণ কৰিবলৈ ব্যৰ্থ" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." msgstr "" -"নতুন নথিপত্ৰৰ বিন্যাসে পত্ৰচিহ্নসমূহ মাইগ্ৰেট কৰা হৈছে । এই কৰ্ম অকল এবাৰ সঞ্চালিত " -"হ'ব ।" +"নতুন নথিপত্ৰৰ বিনেসে পত্ৰচিহ্নসমূহ মাইগ্ৰেট কৰা হৈছে । এই কৰ্ম অকল এবাৰ সঞ্চালিত " +"হ'ব ।" -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "পত্ৰচিহ্নতৰ পুৰনি নথিপত্ৰ খুলিবলৈ ব্যৰ্থ: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "মাইগ্ৰেশন কৰ্ম বাতিল কৰা হৈছে" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "পুৰনি পত্ৰচিহ্নতৰ নথিপত্ৰ আঁতৰাবলৈ ব্যৰ্থ" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Root ফোল্ডাৰ" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "ফোল্ডাৰৰ নাম বৈধ নহয়" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "" +"এই ফোল্ডাৰত \"%s\" নাম বৰ্তমানে ব্যৱহৃত হৈছে । অনুগ্ৰহ কৰি এটা ভিন্ন নাম " +"প্ৰয়োগ কৰক ।" + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +#| msgid "Invalid name for this folder" +msgid "Invalid name for this item" +msgstr "এই বস্তুৰ বাবে এই নাম বৈধ নহয়" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(প্ৰোটোকল: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "আপুনি নিশ্চিতৰূপে %s পত্ৰচিহ্নতৰ তালিকাৰ পৰা আঁতৰাবলৈ ইচ্ছুক নেকি ?" +#| msgid "Are you sure you want to remove %s from bookmarks?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "আপুনি নিশ্চিতৰূপে %s ক পত্ৰচিহ্নৰ তালিকাৰ পৰা আঁতৰাবলৈ ইচ্ছুক নে ?" -#: ../src/vinagre-bookmarks-ui.c:241 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "ফোল্ডাৰ আঁতৰুৱা হ'ব ?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." -msgstr "উল্লেখ্য, পঞ্জিকাত উপস্থিত সকলো উপ-ফোল্ডাৰো আঁতৰুৱা হ'ব ।" +msgstr "উল্লেখ্য, পঞ্জিকাত উপস্থিত সকলো উপ-ফোল্ডাৰো আঁতৰুৱা হ'ব ।" -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "বস্তু আঁতৰুৱা হ'ব ?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "পত্ৰচিহ্ন আঁতৰাবলৈ ব্যৰ্থ: নিবেশ পোৱা নাযায়" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "নতুন ফোল্ডাৰ" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "নথিপত্ৰ বাছি লওক" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "সমৰ্থিত বিন্যাস" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "কোনো সমৰ্থিত নথিপত্ৰ নাই" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"কোনো সক্ৰিয় প্লাগ-ইন দ্বাৰা প্ৰদৰ্শনযোগ্য সমৰ্থিত নথিপত্ৰ উপলব্ধ নাই । কিছুমান প্লাগ-ইন " +"সক্ৰিয় কৰি পুনৰায় প্ৰচেষ্টা কৰক ।" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "নিম্নলিখিত নথিপত্ৰ খোলা নাযায়:" msgstr[1] "নিম্নলিখিত নথিপত্ৰ খোলা নাযায়:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "প্ৰোটোকল তালিকাৰ পৰা সক্ৰিয় প্ৰোটোকল পোৱা নাযায় ।" + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "পূৰ্ববৰ্তী তথ্যৰ নথিপত্ৰ সংৰক্ষণ কৰিবলৈ সমস্যা: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "এটা VNC সেৱক পছন্দ কৰক" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "প্ৰোটোকল %s সমৰ্থিত নহয়" +#: ../vinagre/vinagre-connect.c:340 +#| msgid "Open Remote Desktop Viewer" +msgid "Choose a Remote Desktop" +msgstr "দূৰবৰ্তী এটা ডেস্কটপ নিৰ্বাচন কৰক" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." -msgstr "নথিপত্ৰ খুলিবলৈ ব্যৰ্থ ।" - -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "নথিপত্ৰ পাৰ্স কৰিবলৈ ব্যৰ্থ ।" - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"'shared' শীৰ্ষক ফ্লেগৰ মান সঠিক নহয়: %d । এই ক্ষেত্ৰত 0 (০) অথবা 1 (১) মান হোৱা উচিত । উল্লিখিত " -"মান উপেক্ষা কৰা হ'ব ।" +msgstr "নথিপত্ৰ খুলিবলৈ ব্যৰ্থ ।" -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "নথিপত্ৰেত উপস্থিত গৃহস্থ ঠিকনা সন্ধান কৰিবলৈ ব্যৰ্থ ।" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "কোনো প্লাগ-ইন দ্বাৰা নথিপত্ৰ চিনাক্ত কৰা নাযায় ।" -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "কৰ্ম বৈধ নহয়" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." -msgstr "drag&drop কৰ্মৰ পৰা প্ৰাপ্ত তথ্য বৈধ নহয় ।" +msgstr "drag&drop কৰ্মৰ পৰা প্ৰাপ্ত তথ্য বৈধ নহয় ।" -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "নিকটবৰ্তী গৃহস্থ" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "এটা .vnc নথিপত্ৰ খোলা হয়" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "নথিপত্ৰৰ নাম" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "vinagre ক সম্পূৰ্ণ পৰ্দ্দাত খোলক" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "vinagre-ৰ কোনো উপস্থিত ইনস্টেন্সত প্ৰধান-স্তৰৰ এটা নতুন সংযোগক্ষেত্ৰ নিৰ্মাণ কৰক" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "vinagre য়ে চিনি পোৱা এটা নথিপত্ৰ খোলক" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "নথিপত্ৰৰ নাম" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[সেৱক:পোৰ্ট]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "নিম্নলিখিত ত্ৰুটি উৎপন্ন হৈছে:" msgstr[1] "নিম্নলিখিত ত্ৰুটি উৎপন্ন হৈছে:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- GNOME বাবে VNC গ্ৰাহক" +#: ../vinagre/vinagre-main.c:169 +#| msgid "Remote Desktop Viewer" +msgid "- Remote Desktop Viewer" +msgstr "- দূৰবৰ্তী ডেস্কটপ প্ৰদৰ্শন ব্যৱস্থা" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "আদেশ শাৰী বিকল্পৰ সম্পুৰ্ণ তালিকাৰ বাবে 'vinagre --help' ব্যৱহাৰ কৰক" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "avahi গৃহস্থ-নাম মীমাংসা কৰিবলৈ ব্যৰ্থ: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "%s প্লাগ-ইন দ্বাৰা %s সেৱাৰ বাবে এটা ব্ৰাউজাৰ নিবন্ধন কৰা হৈছে ।" + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to add mDNS browser for service %s." +msgstr "%s সেৱাৰ বাবে mDNS ব্ৰাউজাৰ যোগ কৰিবলৈ ব্যৰ্থ ।" + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "গৃহস্থ ব্ৰাউজ কৰিবলৈ ব্যৰ্থ: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -msgid "Connection to host %s was closed." -msgstr "গৃহস্থ %s-ৰ সৈতে সংযোগ বিচ্ছিন্ন হৈছে" +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS ব্ৰাউজাৰ আৰম্ভ কৰিবলৈ ব্যৰ্থ: %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +#| msgid "Connection to host %s was closed." +msgid "Connection to host %s was closed." +msgstr "গৃহস্থ %s-ৰ সৈতে সংযোগ বিচ্ছিন্ন হৈছে" + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "সংযোগ বিচ্ছিন্ন হৈছে" -#: ../src/vinagre-notebook.c:194 -msgid "Connecting..." -msgstr "সংযোগ স্থাপন কৰা হৈছে..." - -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 -msgid "Close connection" -msgstr "সংযোগ সমাপ্ত কৰক" - -#: ../src/vinagre-prefs.c:169 -msgid "Cannot initialize preferences manager." -msgstr "বৈশিষ্ট্য পৰিচালন ব্যৱস্থা আৰম্ভ কৰা নাযায় ।" - -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "গৃহস্থৰ সৈতে সংযোগ স্থাপনত ত্ৰুটি হৈছে" - -#: ../src/vinagre-tab.c:354 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 #, c-format -msgid "Authentication to host %s has failed" -msgstr "গৃহস্থ %s-এ পৰিচয় প্ৰমাণ কৰিবলৈ ব্যৰ্থ" +#| msgid "Authentication to host %s has failed" +msgid "Authentication to host %s has failed" +msgstr "গৃহস্থ %s লৈ পৰিচয় প্ৰমাণ কৰিবলৈ ব্যৰ্থ" -#: ../src/vinagre-tab.c:360 +#: ../vinagre/vinagre-notebook.c:488 msgid "Authentication failed" msgstr "অনুমোদন ব্যৰ্থ" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "গৃহস্থ %s-ৰ সৈতে পৰিচয় প্ৰমাণেৰ পদ্ধতি সমৰ্থিত নহয় । (%u)" +#: ../vinagre/vinagre-notebook.c:525 +msgid "Connecting..." +msgstr "সংযোগ স্থাপন কৰা হৈছে..." -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "অনুমোদনৰ পদ্ধতি সমৰ্থিত নহয়" +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 +msgid "Close connection" +msgstr "সংযোগ সমাপ্ত কৰক" -#: ../src/vinagre-tab.c:460 -msgid "Error saving recent connection." -msgstr "বৰ্তমান সংযোগ সংৰক্ষণে ত্ৰুটি হৈছে ।" +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "প্লাগ-ইন পৰিচালন ব্যৱস্থা" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "প্লাগ-ইন" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "সক্ৰিয়" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "বিন্যাস কৰক (_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "সক্ৰিয় কৰক (_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "সমস্ত সক্ৰিয় কৰক (_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "সমস্ত নিষ্ক্ৰিয় কৰক (_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +#| msgid "_About" +msgid "_About Plugin" +msgstr "প্লাগ-ইনৰ বিষয়ে (_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "প্লাগ-ইন বিন্যাস কৰক (_o)" -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "চাবি-ৰিংত পৰিচয় সংৰক্ষণে সমস্যা ।" +#: ../vinagre/vinagre-prefs.c:217 +msgid "Cannot initialize preferences manager." +msgstr "বৈশিষ্ট্য পৰিচালন ব্যৱস্থা আৰম্ভ কৰা নাযায় ।" -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "অনুমোদন সংক্ৰান্ত সমস্যা" +#: ../vinagre/vinagre-tab.c:346 +#| msgid "_Full screen" +msgid "Leave fullscreen" +msgstr "সম্পূৰ্ণ পৰ্দাত প্ৰদৰ্শন বন্ধ কৰা হ'ব" -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "এই মেশিন ব্যৱহাৰৰ বাবে ব্যৱহাৰকৰ্তাৰ নাম প্ৰয়োগ কৰা আবশ্যক ।" +#: ../vinagre/vinagre-tab.c:495 +msgid "Error saving recent connection." +msgstr "বৰ্তমান সংযোগ সংৰক্ষণে ত্ৰুটি হৈছে ।" -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "এই মেশিন ব্যৱহাৰৰ বাবে গুপ্তশব্দ প্ৰয়োগ কৰা আবশ্যক ।" +#: ../vinagre/vinagre-tab.c:728 +#| msgid "Error saving the credential on the keyring." +msgid "Error saving the credentials on the keyring." +msgstr "কি-ৰিংত পৰিচয় সংৰক্ষণত সমস্যা ।" -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "সংযোগক্ষেত্ৰ লুকাওক" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "বৰ্তমান সংযোগেৰ স্ক্ৰিন-শট প্ৰাপ্ত কৰা সম্ভৱ নহয় ।" -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "মাপ নিৰ্ধাৰণ" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "পৰ্দাৰ ছবি সংৰক্ষণ কৰক" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "অকল পাঠযোগ্য" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s-ৰ স্ক্ৰিন-শট" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "স্ক্ৰিন-শট লওক" +#: ../vinagre/vinagre-tab.c:881 +#| msgid "Error saving recent connection." +msgid "Error saving screenshot" +msgstr "পৰ্দাৰ ছবি সংৰক্ষণ কৰিবলৈ ত্ৰুটি" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del প্ৰৰণ কৰা হ'ব" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "সেৱাৰ বৈশিষ্ট্য প্ৰাপ্ত কৰা অসম্ভৱ: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "ডেস্কটপৰ নাম:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +#| msgid "Failed to create the directory" +msgid "Impossible to create the connection: %s" +msgstr "সংযোগ নিৰ্মাণ কৰা অসম্ভৱ: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "পোৰ্ট:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "স্ট্ৰিম টিউব গ্ৰহণ কৰা অসম্ভৱ: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "মাত্ৰা:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "যোগাযোগকৰ্তাৰ নাম প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "বৰ্তমান সংযোগেৰ স্ক্ৰিন-শট প্ৰাপ্ত কৰা সম্ভব নহয় ।" +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "অবতাৰ প্ৰাপ্ত কৰা অসম্ভৱ: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "%s-ৰ স্ক্ৰিন-শট" +msgid "%s wants to share his desktop with you." +msgstr "%s আপোনাৰ সৈতে নিজৰ ডেস্কটপটি যৌথৰূপে ব্যৱহাৰ কৰিবলৈ ইচ্ছুক ।" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "পৰ্দাৰ ছবি সংৰক্ষণ কৰক" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"বৰ্তমান সংস্থাপনৰ ক্ষেত্ৰত মাপ নিৰ্ধাৰণ সমৰ্থিত নহয় ।\n" -"\n" -"এই বৈশিষ্ট্য সক্ৰিয় কৰাৰ প্ৰণালী সম্বন্ধে জনাৰ বাবে (Vinagre-ৰ সৈতে উপলব্ধ) README " -"নথিপত্ৰ পঢ়ক ।" +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "ডেস্কটপ যৌথৰূপে ব্যৱহাৰ কৰাৰ আমন্ত্ৰণ" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" -msgstr "মেশিন (_M)" +msgstr "যন্ত্ৰ (_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "সম্পাদনা (_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "প্ৰদৰ্শন (_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "পত্ৰচিহ্ন (_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" -msgstr "দূৰবৰ্তী মেশিনৰ সৈতে সংযোগ স্থাপন কৰক" +msgstr "দূৰবৰ্তী যন্ত্ৰৰ সৈতে সংযোগ স্থাপন কৰক" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "এটা .VNC নথিপত্ৰ খোলক" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "প্ৰোগ্ৰাম বন্ধ কৰক" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "এপ্লিকেশন সংক্ৰান্ত পছন্দ মান পৰিবৰ্তন কৰক" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "পত্ৰচিহ্ন খোলক (_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" -msgstr "এই মেশিনৰ সৈতে সংযোগ স্থাপন কৰক" +msgstr "এই যন্ত্ৰৰ সৈতে সংযোগ স্থাপন কৰক" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "পত্ৰচিহ্ন সম্পাদন কৰক (_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "পছন্দ কৰা পত্ৰচিহ্নটি সম্পাদন কৰক" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "পত্ৰচিহ্নৰ পৰা আঁতৰাওক (_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "বৰ্তমানে পছন্দ কৰা সংযোগটি পত্ৰচিহ্নৰ পৰা আঁতৰাওক" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "নতুন ফোল্ডাৰ (_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "নতুন ফোল্ডাৰ নিৰ্মাণ কৰক" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "বিষয়বস্তু (_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "vinagre-ৰ সহায়িকা খোলক" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "এপ্লিকেশন পৰিচিত" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "টুল-বাৰ(_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "টুল-বাৰ প্ৰদৰ্শন অথবা লুকুৱা হ'ব" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "অৱস্থা-বাৰ (_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "অৱস্থা-বাৰ প্ৰদৰ্শন কৰক অথবা লুকাওক" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "পাৰ্শ্ববৰ্তী পেনেল (_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "পাৰ্শ্ববৰ্তী পেনেল প্ৰদৰ্শন কৰক অথবা লুকাওক" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "বৰ্তমান সংযোগটি বন্ধ কৰক" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "সমগ্ৰ বন্ধ কৰক (_l)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "সকলো সক্ৰিয় সংযোগ বন্ধ কৰক" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "পত্ৰচিহ্নত যোগ কৰক (_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "বৰ্তমান সংযোগটি পত্ৰচিহ্নত যোগ কৰক" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "স্ক্ৰিন-শট লওক" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "বৰ্তমান সংযোগেৰ স্ক্ৰিন-শট লওক" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "সক্ৰিয় সংযোগেৰ বাবে Ctrl+Alt+Del প্ৰৰণ কৰক" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" -msgstr "বৰ্তমান মেশিনকে সম্পূৰ্ণ পৰ্দাত প্ৰদৰ্শন কৰক" - -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "মূল মাপ (_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "দূৰবৰ্তী ডেস্কটপৰ মাপ অনুযায়ী সংযোগক্ষেত্ৰৰ মাপ নিৰ্ধাৰণ কৰিবলৈ ব্যৱহৃত হয়" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "মাপ নিৰ্ধাৰণ (_c)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "দূৰবৰ্তী পৰ্দাটি বৰ্তমান সংযোগক্ষেত্ৰৰ মাপ অনুযায়ী নিৰ্ধাৰণ কৰা হ'ব" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "অকল পাঠযোগ্য (_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "মাউছ আৰু চাবিৰ ফলক নিষ্ক্ৰিয় কৰা হ'ব" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "টুল-বাৰ(_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "টুল-বাৰ প্ৰদৰ্শন অথবা লুকুৱা হ'ব" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "অৱস্থা-বাৰ (_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "অৱস্থা-বাৰ প্ৰদৰ্শন কৰক অথবা লুকাওক" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "পাৰ্শ্ববৰ্তী পেনেল (_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "পাৰ্শ্ববৰ্তী পেনেল প্ৰদৰ্শন কৰক অথবা লুকাওক" +msgstr "বৰ্তমান যন্ত্ৰকে সম্পূৰ্ণ পৰ্দাত প্ৰদৰ্শন কৰক" -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "ত্ৰুটি উৎপন্ন হৈছে:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "GNOME ডেস্কটপে ব্যৱহাৰযোগ্য VNC গ্ৰাহক, Vinagre" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +#| msgid "Could not open the file." +msgid "Could not load builder file: %s" +msgstr "বিল্ডাৰ নথিপত্ৰ লোড কৰিবলৈ ব্যৰ্থ: %s" + +#: ../vinagre/vinagre-utils.c:453 +#| msgid "Vinagre is a VNC client for the GNOME Desktop" +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "GNOME ডেস্কটপত ব্যৱহাৰযোগ্য দূৰবৰ্তী ডেস্কটপ প্ৰদৰ্শন ব্যৱস্থা হ'ল Vinagre" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -731,7 +979,7 @@ "Foundation; either version 2 of the License, or (at your option) any later " "version." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -743,7 +991,7 @@ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -751,30 +999,59 @@ "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre ওয়েবসাইট" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml একত্ৰিত কৰা নাযায়: %s " -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "সম্প্ৰতি ব্যৱহৃত সংযোগ (_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s খোলক:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "কাৰ্সাৰৰ বাবে Ctrl+Alt ব্যৱহাৰ কৰক" +#~ msgid "Connection" +#~ msgstr "সংযোগ" + +#~ msgid "Folder" +#~ msgstr "ফোল্ডাৰ" + +#~ msgid "host or host:display or host::port" +#~ msgstr "host অথবা host:display অথবা host::port" + +#~ msgid "Supported formats" +#~ msgstr "সমৰ্থিত বিন্যাস" + +#~ msgid "Choose a VNC Server" +#~ msgstr "এটা VNC সেৱক পছন্দ কৰক" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "নথিপত্ৰেত উপস্থিত গৃহস্থ ঠিকনা সন্ধান কৰিবলৈ ব্যৰ্থ ।" + +#~ msgid "Opens a .vnc file" +#~ msgstr "এটা .vnc নথিপত্ৰ খোলা হয়" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- GNOME বাবে VNC গ্ৰাহক" + +#~ msgid "Minimize window" +#~ msgstr "সংযোগক্ষেত্ৰ লুকাওক" + +#~ msgid "_Read only" +#~ msgstr "অকল পাঠযোগ্য (_R)" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "কাৰ্সাৰৰ বাবে Ctrl+Alt ব্যৱহাৰ কৰক" diff -Nru vinagre-2.26.1/po/bg.po vinagre-2.29.1/po/bg.po --- vinagre-2.26.1/po/bg.po 2009-03-17 00:19:13.000000000 +0000 +++ vinagre-2.29.1/po/bg.po 2009-08-22 14:29:39.000000000 +0100 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vinagre trunk\n" +"Project-Id-Version: vinagre master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-16 13:28+0200\n" -"PO-Revision-Date: 2009-03-16 13:28+0200\n" +"POT-Creation-Date: 2009-08-20 14:36+0300\n" +"PO-Revision-Date: 2009-08-20 14:36+0300\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -16,11 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Относно" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "Помо_щ" @@ -29,124 +29,120 @@ msgstr "Достъп до отдалечени работни места" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Отдалечени работни места" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Изисква се идентификация" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Настройки на връзката" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Връзка" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Папка" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Интерфейс" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Настройки" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Родителска папка" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Към коя машина искате да се свържете?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Всички горни полета са задължителни" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Всички горни полета са задължителни" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Изисква се идентификация" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Отметки" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Връзка" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Настройки на връзката" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Папка" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Адрес:" -#: ../data/vinagre.glade.h:12 -msgid "Preferences" +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Интерфейс" + +#: ../data/vinagre.ui.h:9 +msgid "Options" msgstr "Настройки" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "Дали да се показват подпрозорци, дори когато има само една връзка" +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Родителска папка" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Дали да се показват клавишните комбинации в менюто" +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "Настройки" + +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Към коя машина искате да се свържете?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Винаги да се показват табове" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Идентифициране" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "На _цял екран" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Адрес:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Име:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Парола:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "П_ротокол:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Запомняне на паролата" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Мащабиране" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Показване на клавишните комбинации в менюто" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "Потребителско _име:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Без контрол" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Включени приставки" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "машина или машина:дисплей, или машина::порт" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Списък с включените приставки. Съдържа местоположението им („Location“). За " +"тази информация погледнете файла „.vinagre-plugin“." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Максималният брой запомнени връзки в прозореца за връзки" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -157,7 +153,7 @@ "клавишните комбинации се прихващат от менюто и не се пращат към отдалечената " "машина." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -165,17 +161,17 @@ "Задайте да е истина и подпрозорците винаги ще се показват. Задайте да е лъжа " "и подпрозорци ще се показват при повече от една активна връзка." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Указва максималния брой запомнени връзки в падащото меню в прозореца за " "връзки." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Програмата за обработка на адреси от вида „vnc://“" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -185,10 +181,19 @@ "връзките с другите клиенти или да ги прекъсне. Задайте да е истина, за да " "споделяте работното място с други клиенти." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Дали другите клиенти да останат свързани" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Дали да се показват подпрозорци, дори когато има само една връзка" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Дали да се показват клавишните комбинации в менюто" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Файл за отдалечена връзка (vnc)" @@ -197,100 +202,280 @@ msgid "Remote Desktop Connection" msgstr "Връзка с отдалечено работно място" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Достъп до компютри с Unix/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Порт:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Поддръжка на SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Неправилна стойност за флага „shared“ (споделяне): %d, а трябва да бъде „0“ " +"или „1“. Стойността няма да се ползва." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Ползване на мащабиран режим" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Опции на VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Показване на опциите за VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Достъп до компютри с Unix/Linux, Windows и др." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Файлът не може да бъде инициализиран." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Файлът не е във формат за VNC. Липсва групата „connection“." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Файлът не е във формат за VNC. Липсва ключът „host“." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Настройки на VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Без контрол" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Мащабиране" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Файлове за VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Име на работния плот:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Размери:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Грешка при свързване със сървър." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Методът за идентификация не се поддържа от машината %s. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Методът за идентификация не се поддържа" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Грешка в идентификацията" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "За достъп до машината се изисква потребителско име." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "За достъп до машината се изисква парола." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "_Мащабиране" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Напасване на отдалечения екран в размера на текущия прозорец" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Без изпращане на събитията от мишката и клавиатурата" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Първоначален размер" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Преоразмеряване на прозореца към размера на отдалечения работен плот" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Изпращане на „Ctrl-Alt-Del“" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Изпращане на „Ctrl+Alt+Del“ към отдалечената машина" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Мащабиране" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Без контрол" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Мащабирането не се поддържа в тази инсталация.\n" +"\n" +"Прочетете файла README, който идва с Vinagre, за да разберете как да " +"включите тази настройка." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Поддръжка на VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Меню за бързо свързване към отдалечена машина" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Фабрика за аплети на Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "vinagre не може да се стартира:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Отдалечени работни места" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Достъп до отметките" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Протоколът „%s“ не се поддържа." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Грешка при инициализирането на отметки: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Непозната грешка" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Грешка при инициализирането на отметките: файлът е празен" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Грешка при инициализирането на отметки: това не е файл с отметки на vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "" "Грешка при запазване на отметки: структурата в XML не може де бъде създадена" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "Грешка при запазване на отметки: структурата в XML не може де бъде " "инициализирана" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Грешка при запазване на отметки: структурата в XML не може де бъде завършена" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Грешка при запазване на отметки: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "Грешка при мигриране на отметки: структурата в XML не може де бъде създадена" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Грешка при мигриране на отметки: структурата в XML не може де бъде " "инициализирана" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Грешка при мигриране на отметки: структурата в XML не може де бъде " "финализирана" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Грешка при мигрирането на отметки: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Грешка при мигрирането на отметки: Приставката за VNC не е включена" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Папката не може да бъде създадена" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -298,448 +483,490 @@ "Мигриране на файла с отметките в новия формат. Това действие трябва да е " "еднократно." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Грешка при отварянето на стар файл с отметки: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Миграцията е отменена" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Старият файл с отметки не може да бъде изтрит" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Коренова папка" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" -msgstr "Неправилно име на папката" +msgstr "Неправилно име за папката" + +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "Името „%s“ вече се използва в тази папка. Използвайте различно." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "Неправилно име за този обект" -#: ../src/vinagre-bookmarks-ui.c:236 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Сигурни ли сте, че искате да изтриете %s от отметките?" +msgid "(Protocol: %s)" +msgstr "(Протокол: %s)" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Сигурни ли сте, че искате да изтриете %s от отметките?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Да се изтрие ли папката?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Забележете, че всички нейни подпапки също ще бъдат изтрити." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Да се изтрие ли обектът?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Грешка при изтриването на отметка: елементът не е открит" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Нова папка" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Изберете файла" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Поддържани формати" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Липсват поддържани файлове" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Никоя от включените приставки не може да отвори такъв файл. Включете още " +"приставки и пробвайте отново." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Следният файл не може да бъде отворен:" msgstr[1] "Следните файлове не могат да бъдат отворени:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Не може да бъде получен действащият протокол от списъка с протоколи." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Грешка при запазване на файла с отметки: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Изберете сървър за VNC" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Избор на отдалечено работно място" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Протоколът „%s“ не се поддържа." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Файлът не може да бъде отворен." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Файлът не може да бъде инициализиран." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Файлът не се разпознава от никоя от приставките." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Неправилна стойност за флага „shared“ (споделяне): %d, а трябва да бъде „0“ " -"или „1“. Стойността няма да се ползва." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Адресът на машината не може да бъде открит във файла." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Неправилна операция" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Данните получени чрез довлачване са неправилни." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Съседни машини" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Отваряне на файл .vnc" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "име_на_файл" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Стартиране на vinagre в режим на цял екран" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Създаване на нов прозорец от най-горно ниво във вече стартиран vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Отваряне на файл поддържан от vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "име_на_файл" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[сървър:порт]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Възникна следната грешка:" msgstr[1] "Възникнаха следните грешки:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "— клиент за VNC за GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "— отдалечени работни места" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Изпълнете „vinagre --help“, за да видите пълния списък с налични опции за " "командния ред" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Не може да се открие по име компютърът за avahi: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Приставката %s вече е регистрирала браузър за услугата %s." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Мрежата не може да се прегледа по mDNS за услугата %s" + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Мрежата не може да се прегледа за машини: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "" +"Не може да се инициализира прегледа на мрежата по mDNS за услугата %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Връзката към машината %s бе прекъсната." +msgid "Connection to host %s was closed." +msgstr "Връзката към машината %s бе прекъсната." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Връзката бе прекъсната" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Неуспешна идентификация пред машината %s" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Неуспешна идентификация" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Свързване…" -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Прекъсване на връзката" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Управление на приставки" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Приставка" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Включена" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Настройване" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Включване" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "В_ключване на всички" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Изключване на всички" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Относно приставката" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "_Настройване на приставката" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Мениджърът на настройките не може да бъде инициализиран." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Грешка при свързване със сървър." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Неуспешна идентификация пред машината %s" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Неуспешна идентификация" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "" -"Методът за идентификация (%2$u) не се поддържа от машината %1$s." +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Изход от цял екран" -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Методът за идентификация не се поддържа" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Грешка при запазване на скоро отваряна връзка." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Грешка при запазване на паролата в ключодържателя." - -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Грешка в идентификацията" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "За достъп до машината се изисква потребителско име." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Грешка при запазване на паролите в ключодържателя." -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "За достъп до машината се изисква парола." +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Не може да се заснеме снимка на екрана на връзката." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Минимизиране на прозореца" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Запазване на снимката на екрана" -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Мащабиране" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Снимка на екрана на %s" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Без контрол" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Грешка при запазване снимката на екрана" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Снимка на екрана" +#: ../vinagre/vinagre-tube-handler.c:232 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Настройката на услугата не може да бъде получена: %s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Изпращане на „Ctrl-Alt-Del“" +#: ../vinagre/vinagre-tube-handler.c:289 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Връзката не може да бъде осъществена: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Име на работния плот:" +#: ../vinagre/vinagre-tube-handler.c:328 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Потокът не може да бъде приет: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Порт:" +#: ../vinagre/vinagre-tube-handler.c:404 +#, c-format +msgid "Failed to request name: %s" +msgstr "Името не може да бъде заявено: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Размери:" +#: ../vinagre/vinagre-tube-handler.c:405 +msgid "No error given" +msgstr "Не е дадена грешка" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Не може да се заснеме снимка на екрана на връзката." +#: ../vinagre/vinagre-tube-handler.c:482 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Името на контакта не може да бъде получено: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:517 #, c-format -msgid "Screenshot of %s" -msgstr "Снимка на екрана на %s" +msgid "Impossible to get the avatar: %s" +msgstr "Аватарът не може да бъде получен: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Запазване на снимката на екрана" +#: ../vinagre/vinagre-tube-handler.c:538 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s иска да сподели работния си плот с вас." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Мащабирането не се поддържа в тази инсталация.\n" -"\n" -"Прочетете файла README, който идва с Vinagre, за да разберете как да " -"включите тази настройка." +#: ../vinagre/vinagre-tube-handler.c:543 +msgid "Desktop sharing invitation" +msgstr "Покана за споделено работно място" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Машина" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Редактиране" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Изглед" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Отметки" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Свързване към отдалечена машина" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Отваряне на файл .vnc" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Спиране на програмата" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Редактиране на настройките на приложението" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Отваряне на отметка" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Свързване към тази машина" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Редактиране на отметка" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Редактиране на настройките на избраната отметка" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Изтриване от отметките" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Изтриване на избраната връзка от отметките" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Нова папка" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "_Създаване на нова папка" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Ръководство" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Отваряне на ръководството на vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Относно това приложение" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Лента с инструменти" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Показване/скриване на лентата с инструменти" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Лента за _състоянието" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Показване/скриване на лентата за състоянието" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Страничен _панел" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Показване/скриване на страничния панел" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Прекъсване на текущата връзка" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Прекъсване на всички" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Прекъсване на всички връзки" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Добавяне на отметка" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Добавяне на текущата връзка към отметките ви" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Снимка на екрана" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Снимка на екрана на действащата връзка" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Изпращане на комбинацията „Ctrl+Alt+Del“ през активната връзка" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "На цял екран" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Първоначален размер" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Преоразмеряване на прозореца към размера на отдалечения работен плот" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "_Мащабиране" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Напасване на отдалечения екран в размера на текущия прозорец" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Без контрол" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Изключване на действието на мишката и клавиатурата" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Лента с инструменти" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Показване/скриване на лентата с инструменти" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Лента за _състоянието" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Показване/скриване на лентата за състоянието" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Страничен _панел" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Показване/скриване на страничния панел" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Възникна следната грешка:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre е клиент за VNC за работната среда GNOME" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Изграждащият файл не може да бъде отворен: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre е клиент за отдалечена работа за GNOME" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -751,7 +978,7 @@ "е публикуван от Фондацията за свободен софтуер — версия 2 на лиценза или (по " "ваше решение) по-късна версия." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -762,7 +989,7 @@ "НИКАКВИ ГАРАНЦИИ, дори и косвените за ПРОДАЖБА или СЪОТВЕТСТВИЕ С КАКВАТО И " "ДА Е УПОТРЕБА. За подробности погледнете Общия публичен лиценз на GNU." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -771,7 +998,7 @@ "заедно с тази програма. Ако не сте, погледнете ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Александър Шопов \n" @@ -780,25 +1007,21 @@ "Научете повече за нас на http://gnome.cult.bg\n" "Докладвайте за грешки на http://gnome.cult.bg/bugs" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Уеб сайт на Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Файлът vinagre-ui.xml не може да бъде слян: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "С_коро отваряни връзки" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Свързване към %s:%d" - -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Натиснете Ctrl+Alt, за да освободите показалеца на мишката" diff -Nru vinagre-2.26.1/po/bn_IN.po vinagre-2.29.1/po/bn_IN.po --- vinagre-2.26.1/po/bn_IN.po 2009-03-17 00:19:13.000000000 +0000 +++ vinagre-2.29.1/po/bn_IN.po 2009-08-25 13:34:17.000000000 +0100 @@ -9,21 +9,21 @@ msgstr "" "Project-Id-Version: bn_IN\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-02-18 20:37+0000\n" -"PO-Revision-Date: 2009-03-10 14:55+0530\n" +"POT-Creation-Date: 2009-08-18 12:06+0000\n" +"PO-Revision-Date: 2009-08-25 17:38+0530\n" "Last-Translator: Runa Bhattacharjee \n" -"Language-Team: Bengali INDIA \n" +"Language-Team: Bengali INDIA \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "পরিচিতি (_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "সাহায্য (_H)" @@ -32,127 +32,129 @@ msgstr "দূরবর্তী ডেস্কটপের সাথে সংযোগ করুন" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "দূরবর্তী ডেস্কটপ প্রদর্শন ব্যবস্থা" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "পরিচয় প্রমাণ করা আবশ্যক" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "সংযোগ সংক্রান্ত বিকল্প" +#: ../data/vinagre.ui.h:1 +#| msgid "All fields above are mandatory" +msgid "All fields above are mandatory" +msgstr "উপরোক্ত সকল ক্ষেত্রে মান পূরণ করা আবশ্যক" + +#: ../data/vinagre.ui.h:2 +#| msgid "Authentication is required" +msgid "Authentication is required" +msgstr "পরিচয় প্রমাণ করা আবশ্যক" -#: ../data/vinagre.glade.h:3 -#| msgid "Connection options" -msgid "Connection" -msgstr "সংযোগ" +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 +msgid "Bookmarks" +msgstr "বুকমার্ক সংকলন" -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "ফোল্ডার" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "প্রেক্ষাপট" +#: ../data/vinagre.ui.h:4 +#| msgid "Connecting..." +msgid "Connection" +msgstr "সংযোগ স্থাপন করা হচ্ছে" -#: ../data/vinagre.glade.h:6 +#: ../data/vinagre.ui.h:5 #| msgid "Connection options" -msgid "Options" -msgstr "বিকল্প" +msgid "Connection options" +msgstr "সংযোগ সংক্রান্ত বিকল্প" -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "ঊর্ধ্বতন ফোল্ডার" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "আপনি কোন মেশিনের সাথে সংযোগ স্থাপন করতে চান?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "উপরোক্ত সকল ক্ষেত্রে মান পূরণ করা আবশ্যক" +#: ../data/vinagre.ui.h:6 +#| msgid "New Folder" +msgid "Folder" +msgstr "ফোল্ডার" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 -msgid "Bookmarks" -msgstr "বুকমার্ক সংকলন" - -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1066 +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "হোস্ট:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +#| msgid "Interface" +msgid "Interface" +msgstr "প্রেক্ষাপট" + +#: ../data/vinagre.ui.h:9 +#| msgid "Options" +msgid "Options" +msgstr "বিকল্প" + +#: ../data/vinagre.ui.h:10 +#| msgid "Parent Folder" +msgid "Parent Folder" +msgstr "ঊর্ধ্বতন ফোল্ডার" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "পছন্দ" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "শুধুমাত্র একটি সক্রিয় সংযোগ থাকলে ট্যাব প্রদর্শন করা হবে কি না" +#: ../data/vinagre.ui.h:12 +#| msgid "Which machine do you want to connect to?" +msgid "Which machine do you want to connect to?" +msgstr "কোন মেশিনের সাথে সংযোগ স্থাপন করতে আপনি ইচ্ছুক?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "মেনু অ্যাকসেলেরেটর (শর্টকাট-কি) প্রদর্শন করা হবে কি না" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "সর্বদা ট্যাব প্রদর্শন করা হবে (_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "অনুমোদন (_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "সম্পূর্ণ পর্দায় প্রদর্শন (_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "হোস্ট:(_H)" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "নাম:(_N)" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "পাসওয়ার্ড:(_P)" -#: ../data/vinagre.glade.h:22 -#| msgid "_Remember this password" +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "প্রোটোকল: (_P)" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "এই পরিচয় মনে রাখা হবে (_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "মাপ নির্ণয় (_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "মেনুর শর্ট-কাট প্রদর্শন করা হবে (_S)" -#: ../data/vinagre.glade.h:25 -#| msgid "_Name:" +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "ব্যবহারকারীর নাম: (_U)" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "শুধুমাত্র প্রদর্শন (_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "সক্রিয় প্লাগ-ইন" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "host অথবা host:display অথবা host::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"সক্রিয় প্লাগ-ইনের তালিকা। এর মধ্যে সক্রিয় প্লাগ-ইনের \"অবস্থান\" অন্তর্ভুক্ত রয়েছে। " +"কোনো সুনির্দিষ্ট প্লাগ-ইনের \"অবস্থান\" জানার জন্য .vinagre-plugin ফাইলটি দেখুন।" -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "সংযোগের ডায়লগ বক্সের মধ্যে প্রদর্শনযোগ্য পূর্ববর্তী তথ্যের সর্বাধিক তালিকা" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -160,9 +162,9 @@ msgstr "" "মেনু শর্ট-কাট নিষ্ক্রিয় করার জন্য \"false\" নির্ধারণ করুন। শর্ট-কাট সক্রিয় করার জন্য " "\"true\" নির্ধারণ করুন। উল্লেখ্য, এইগুলি সক্রিয় করা হলে, মেনু দ্বারা এই কি-গুলির কর্ম " -"সনাক্ত ও গ্রহণ করা হবে এবং দূরবর্তী হোস্টকে প্রেরণ করা হবে না।" +"সনাক্ত ও গ্রহণ করা হবে এবং দূরবর্তী হোস্টকে পাঠানো হবে না।" -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -170,15 +172,15 @@ "মান \"true\" নির্ধারণ করা হলে সর্বদা ট্যাব প্রদর্শন করা হবে। শুধুমাত্র একাধিক সক্রিয় " "সংযোগ উপস্থিত থাকলে ট্যাব প্রদর্শনের জন্য মান \"false\" নির্ধারণ করুন।" -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "হোস্ট ড্রপ-ডাউন এনট্রির মধ্যে প্রদর্শনযোগ্য তথ্যের সর্বাধিক সংখ্যা।" -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr " \"vnc://\" URL এর হ্যান্ডলার" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -188,10 +190,18 @@ "ক্লায়েন্টের সাথে সংযোগ বিচ্ছিন্ন করতে অথবা না করতে অনুরোধ করা যেতে পারে। অন্যান্য " "ক্লায়েন্টের সাথে ডেস্কটপ যৌথরূপে ব্যবহারের জন্য মান true নির্ধারণ করুন।" -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "অন্যান্য ক্লায়েন্টের সংযোগ অপরিবর্তিত থাকবে কি না" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "শুধুমাত্র একটি সক্রিয় সংযোগ থাকলে ট্যাব প্রদর্শন করা হবে কি না" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "মেনু অ্যাকসেলেরেটর (শর্টকাট-কি) প্রদর্শন করা হবে কি না" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "দূরবর্তী ডেস্কটপ (VNC) ফাইল" @@ -200,553 +210,770 @@ msgid "Remote Desktop Connection" msgstr "দূরবর্তী ডেস্কটপ সংযোগ" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux টার্মিন্যাল ব্যবহার করুন" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "পোর্ট:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH সমর্থন ব্যবস্থা" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"'shared' শীর্ষক ফ্ল্যাগের মান সঠিক নয়: %d। এই ক্ষেত্রে 0 (০) অথবা 1 (১) মান হওয়া " +"উচিত। উল্লিখিত মান উপেক্ষা করা হবে।" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Enable scaled mode" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC Options:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Show VNC Options" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows ও অন্যান্য মেশিন ব্যবহার করুন।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "ফাইল পার্স করতে ব্যর্থ।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "এটি VNC ফাইল নয়: \"connection\" দলটি অনুপস্থিত" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "এটি VNC ফাইল নয়: \"host\" কি অনুপস্থিত" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC সংক্রান্ত বিকল্প" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "শুধুমাত্র প্রদর্শন (_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "মাপ নির্ণয় (_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC-র ফাইল" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "ডেস্কটপের নাম:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "দিকমাত্রা:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "হোস্টের সাথে সংযোগ স্থাপনে ত্রুটি ঘটেছে" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +#| msgid "Authentication method to host %s is unsupported. (%u)" +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "হোস্ট %s-র সাথে পরিচয় প্রমাণের পদ্ধতি সমর্থিত নয়। (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "অনুমোদনের পদ্ধতি সমর্থিত নয়" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "অনুমোদন সংক্রান্ত সমস্যা" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "এই মেশিনটি ব্যবহারের জন্য ব্যবহারকারীর নাম প্রয়োগ করা আবশ্যক।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "এই মেশিনটি ব্যবহারের জন্য পাসওয়ার্ড প্রয়োগ করা আবশ্যক।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "মাপ নির্ধারণ (_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "দূরবর্তী পর্দাটি বর্তমান উইন্ডোর মাপ অনুযায়ী নির্ধারণ করা হবে" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "মাউস ও কি-বোর্ড থেকে উৎপন্ন ইভেন্ট পাঠানো হবে না" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "মূল মাপ (_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "দূরবর্তী ডেস্কটপের মাপ অনুযায়ী উইন্ডোর মাপ নির্ধারণ করতে ব্যবহৃত হয়" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del পাঠানো হবে" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "দূরবর্তী মেশিনে Ctrl+Alt+Del সংকেত পাঠানো হয়" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "মাপ নির্ধারণ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "শুধুমাত্র পাঠযোগ্য" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"বর্তমান ইনস্টলেশনের ক্ষেত্রে মাপ নির্ধারণ সমর্থিত নয়।\n" +"\n" +"এই বৈশিষ্ট্য সক্রিয় করার প্রণালী সম্বন্ধে জানার জন্য (Vinagre-র সাথে উপলব্ধ) README " +"ফাইল পড়ুন।" + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC সমর্থন" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "দূরবর্তী মেশিনের সাথে দ্রুত সংযোগ স্থাপনের মেনু" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre অ্যাপলেট ফ্যাক্টরি" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 -#| msgid "Could not run vinagre: %s" +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "vinagre চালাতে ব্যর্থ:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "দূরবর্তী ডেস্কটপ প্রদর্শন ব্যবস্থা আরম্ভ করুন" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "বুকমার্ক প্রয়োগ করুন" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256 +#, c-format +msgid "The protocol %s is not supported." +msgstr "প্রোটোকল %s সমর্থিত নয়" + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "বুকমার্ক শুরু করতে ত্রুটি ঘটেছে: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:275 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "অজানা ত্রুটি" -#: ../src/vinagre-bookmarks.c:351 -#| msgid "Error while initializing bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "বুকমার্ক প্রারম্ভ করতে ব্যর্থ: ফাইলটি সম্ভবত ফাঁকা" -#: ../src/vinagre-bookmarks.c:358 -#| msgid "Error while initializing bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "বুকমার্ক প্রারম্ভ করতে ব্যর্থ: এটি vinagre বুকমার্ক ফাইল নয়" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "বুকমার্ক সংরক্ষণ করতে ব্যর্থ: XML বিন্যাস গঠন করতে ব্যর্থ" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "বুকমার্ক সংরক্ষণ করতে ব্যর্থ: XML বিন্যাস আরম্ভ করতে ব্যর্থ" -#: ../src/vinagre-bookmarks.c:450 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "বুকমার্ক সংরক্ষণ করতে ব্যর্থ: XML বিন্যাস নির্ধারণ করতে ব্যর্থ" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "বুকমার্ক সংরক্ষণে ত্রুটি ঘটেছে: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "বুকমার্ক মাইগ্রেট করতে ব্যর্থ: XML বিন্যাস গঠন করতে ব্যর্থ" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "বুকমার্ক মাইগ্রেট করতে ব্যর্থ: XML বিন্যাস আরম্ভ করতে ব্যর্থ" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "বুকমার্ক মাইগ্রেট করতে ব্যর্থ: XML বিন্যাস নির্ধারণ করতে ব্যর্থ" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format -#| msgid "Error while saving bookmarks: %s" msgid "Error while migrating bookmarks: %s" msgstr "বুকমার্ক মাইগ্রেট করতে সমস্যা: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +#| msgid "Error while migrating bookmarks: %s" +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "বুকমার্ক মাইগ্রেট করতে সমস্যা: VNC প্লাগ-ইন সক্রিয় নয়" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "ডিরেক্টরি নির্মাণ করতে ব্যর্থ" -#: ../src/vinagre-bookmarks-migration.c:255 -#| msgid "" -#| "Copying the bookmarks file to the new location. This operation is only " -#| "supposed to run once." +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." -msgstr "নতুন ফাইলের বিন্যাসে বুকমার্কগুলি মাইগ্রেট করা হচ্ছে। এই কর্ম শুধুমাত্র একবার সঞ্চালিত হবে।" +msgstr "" +"নতুন ফাইলের বিন্যাসে বুকমার্কগুলি মাইগ্রেট করা হচ্ছে। এই কর্ম শুধুমাত্র একবার সঞ্চালিত " +"হবে।" -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format -#| msgid "Error while saving bookmarks: %s" msgid "Error opening old bookmarks file: %s" msgstr "বুকমার্কের পুরোনো ফাইল খুলতে ব্যর্থ: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "মাইগ্রেশন কর্ম বাতিল করা হয়েছে" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "পুরোনো বুকমার্কের ফাইল মুছে ফেলতে ব্যর্থ" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Root ফোল্ডার" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "ফোল্ডারের নাম বৈধ নয়" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "" +"এই ফোল্ডারের মধ্যে \"%s\" নামটি বর্তমানে ব্যবহৃত হচ্ছে। অনুগ্রহ করে একটি ভিন্ন নাম " +"প্রয়োগ করুন।" + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "এই বস্তুর জন্য এই নাম বৈধ নয়" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(প্রোটোকল: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "আপনি কি নিশ্চিতরূপে %s-কে বুকমার্কের তালিকা থেকে সরিয়ে ফেলতে ইচ্ছুক?" +#| msgid "Are you sure you want to remove %s from bookmarks?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "আপনি কি নিশ্চিতরূপে %s-কে বুকমার্কের তালিকা থেকে সরিয়ে ফেলতে ইচ্ছুক?" -#: ../src/vinagre-bookmarks-ui.c:241 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "ফোল্ডার মুছে ফেলা হবে কি?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "উল্লেখ্য, ডিরেক্টরির মধ্যে উপস্থিত সকল সাব-ফোল্ডার" -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "বস্তু মুছে ফেলা হবে কি?" -#: ../src/vinagre-bookmarks-ui.c:264 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "বুকমার্ক সরিয়ে ফেলতে ব্যর্থ: এনট্রি পাওয়া যায়নি" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "নতুন ফোল্ডার" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "ফাইল বেছে নিন" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1156 -msgid "Supported formats" -msgstr "সমর্থিত বিন্যাস" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "কোনো সমর্থিত ফাইল নেই" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "কোনো সক্রিয় প্লাগ-ইন দ্বারা প্রদর্শনযোগ্য সমর্থিত ফাইল উপলব্ধ নেই। কেয়কটি প্লাগ-ইন সক্রিয় করে পুনরায় প্রচেষ্টা করুন।" + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "নিম্নলিখিত ফাইল খোলা যায়নি:" msgstr[1] "" -#: ../src/vinagre-connect.c:179 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "প্রোটোকল তালিকা থেকে সক্রিয় প্রোটোকল পাওয়া যায়নি।" + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "পূর্ববর্তী তথ্যের ফাইল সংরক্ষণ করতে সমস্যা: %s" -#: ../src/vinagre-connect.c:191 -msgid "Choose a VNC Server" -msgstr "একটি VNC সার্ভার পছন্দ করুন" - -#: ../src/vinagre-connection.c:600 -#, c-format -msgid "The protocol %s is not supported." -msgstr "প্রোটোকল %s সমর্থিত নয়" +#: ../vinagre/vinagre-connect.c:340 +#| msgid "Open Remote Desktop Viewer" +msgid "Choose a Remote Desktop" +msgstr "দূরবর্তী একটি ডেস্কটপ নির্বাচন করুন" -#: ../src/vinagre-connection.c:695 -#| msgid "Choose the file" +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "ফাইল খুলতে ব্যর্থ।" -#: ../src/vinagre-connection.c:714 -#| msgid "Choose the file" -msgid "Could not parse the file." -msgstr "ফাইল পার্স করতে ব্যর্থ।" - -#: ../src/vinagre-connection.c:759 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "'shared' শীর্ষক ফ্ল্যাগের মান সঠিক নয়: %d। এই ক্ষেত্রে 0 (০) অথবা 1 (১) মান হওয়া উচিত। উল্লিখিত মান উপেক্ষা করা হবে।" - -#: ../src/vinagre-connection.c:765 -msgid "Could not find the host address in the file." -msgstr "ফাইলের মধ্যে উপস্থিত হোস্ট ঠিকানা সন্ধান করতে ব্যর্থ।" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "কোনো প্লাগ-ইন দ্বারা ফাইলটি সনাক্ত করা যায়নি।" -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "কর্ম বৈধ নয়" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "drag&drop (ড্র্যাগ ও ড্রপ) কর্ম থেকে প্রাপ্ত তথ্য বৈধ নয়।" -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "নিকটবর্তী হোস্ট" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "একটি .vnc ফাইল খোলা হয়" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Open vinagre in fullscreen mode" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "ফাইলের নাম" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" -msgstr "vinagre-র কোনো উপস্থিত ইনস্ট্যান্সের মধ্যে প্রধান-স্তরের একটি নতুন উইন্ডো নির্মাণ করুন" +msgstr "Create a new toplevel window in an existing instance of vinagre" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Open a file recognized by vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "filename" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" -msgstr "[সার্ভার:পোর্ট]" +msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "নিম্নলিখিত ত্রুটি উৎপন্ন হয়েছে:" -msgstr[1] "" +msgstr[1] "নিম্নলিখিত ত্রুটি উৎপন্ন হয়েছে:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- GNOME জন্য VNC ক্লায়েন্ট" +#: ../vinagre/vinagre-main.c:169 +#| msgid "Remote Desktop Viewer" +msgid "- Remote Desktop Viewer" +msgstr "- দূরবর্তী ডেস্কটপ প্রদর্শন ব্যবস্থা" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "কম্যান্ড লাইন বিকল্পের সম্পুর্ণ তালিকার জন্য 'vinagre --help' ব্যবহার করুন" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "avahi হোস্ট-নেম মীমাংসা করতে ব্যর্থ: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "%s প্লাগ-ইন দ্বারা %s পরিসেবার জন্য একটি ব্রাউজার নিবন্ধন করা হয়েছে।" + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to add mDNS browser for service %s." +msgstr "%s পরিসেবার জন্য mDNS ব্রাউজার যোগ করতে ব্যর্থ।" + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "হোস্ট ব্রাউজ করতে ব্যর্থ: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS ব্রাউজার আরম্ভ করতে ব্যর্থ: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -#| msgid "Connection to host \"%s\" was closed." -msgid "Connection to host %s was closed." -msgstr "হোস্ট %s-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে" +#| msgid "Connection to host %s was closed." +msgid "Connection to host %s was closed." +msgstr "হোস্ট %s-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে" -#: ../src/vinagre-notebook.c:170 -#| msgid "Connection to host \"%s\" was closed." +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "সংযোগ বিচ্ছিন্ন হয়েছে" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +#| msgid "Authentication to host %s has failed" +msgid "Authentication to host %s has failed" +msgstr "হোস্ট %s-এ পরিচয় প্রমাণ করতে ব্যর্থ" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "পরিচয় প্রমাণ করতে ব্যর্থ" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "সংযোগ স্থাপন করা হচ্ছে..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:882 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "সংযোগ সমাপ্ত করুন" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "প্লাগ-ইন পরিচালন ব্যবস্থা" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "প্লাগ-ইন" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "সক্রিয়" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "কনফিগার করুন (_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "সক্রিয় করুন (_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "সমস্ত সক্রিয় করুন (_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "সমস্ত নিষ্ক্রিয় করুন (_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +#| msgid "_About" +msgid "_About Plugin" +msgstr "প্লাগ-ইন পরিচিতি (_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "প্লাগ-ইন কনফিগার করুন (_o)" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "বিবিধ পছন্দের তালিকা শুরু করা সম্ভব হয়নি" -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "হোস্টের সাথে সংযোগ স্থাপনে ত্রুটি ঘটেছে" +#: ../vinagre/vinagre-tab.c:346 +#| msgid "_Full screen" +msgid "Leave fullscreen" +msgstr "সম্পূর্ণ পর্দায় প্রদর্শন বন্ধ করা হবে" -#: ../src/vinagre-tab.c:354 -#, c-format -#| msgid "Authentication to host \"%s\" has failed" -msgid "Authentication to host %s has failed" -msgstr "হোস্ট %s-এ পরিচয় প্রমাণ করতে ব্যর্থ" - -#: ../src/vinagre-tab.c:360 -#| msgid "Authentication to host \"%s\" has failed" -msgid "Authentication failed" -msgstr "পরিচয় প্রমাণ করতে ব্যর্থ" - -#: ../src/vinagre-tab.c:382 -#, c-format -#| msgid "Authentication method to host \"%s\" is unsupported. (%u)" -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "হোস্ট %s-র সাথে পরিচয় প্রমাণের পদ্ধতি সমর্থিত নয়। (%u)" - -#: ../src/vinagre-tab.c:386 -#| msgid "Authentication method to host \"%s\" is unsupported. (%u)" -msgid "Authentication unsupported" -msgstr "অনুমোদনের পদ্ধতি সমর্থিত নয়" - -#: ../src/vinagre-tab.c:464 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "বর্তমান সংযোগ সংরক্ষণে ত্রুটি ঘটেছে।" -#: ../src/vinagre-tab.c:496 -#| msgid "Error saving the password on the keyring." -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "কি-রিং এ পরিচয় সংরক্ষণে সমস্যা।" -#: ../src/vinagre-tab.c:751 ../src/vinagre-tab.c:768 -msgid "Authentication error" -msgstr "অনুমোদন সংক্রান্ত সমস্যা" - -#: ../src/vinagre-tab.c:752 -msgid "A username is required in order to access this machine." -msgstr "এই মেশিনটি ব্যবহারের জন্য ব্যবহারকারীর নাম প্রয়োগ করা আবশ্যক।" - -#: ../src/vinagre-tab.c:769 -msgid "A password is required in order to access this machine." -msgstr "এই মেশিনটি ব্যবহারের জন্য পাসওয়ার্ড প্রয়োগ করা আবশ্যক।" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "বর্তমান সংযোগের স্ক্রিন-শট প্রাপ্ত করা সম্ভব হয়নি।" -#: ../src/vinagre-tab.c:895 -msgid "Minimize window" -msgstr "উইন্ডো আড়াল করুন" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "স্ক্রিন-শট সংরক্ষণ করুন" -#: ../src/vinagre-tab.c:910 ../src/vinagre-tab.c:911 -msgid "Scaling" -msgstr "মাপ নির্ধারণ" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s-র স্ক্রিন-শট" -#: ../src/vinagre-tab.c:920 ../src/vinagre-tab.c:921 -msgid "Read only" -msgstr "শুধুমাত্র পাঠযোগ্য" +#: ../vinagre/vinagre-tab.c:881 +#| msgid "Error saving recent connection." +msgid "Error saving screenshot" +msgstr "পর্দার ছবি সংরক্ষণ করতে ত্রুটি" -#. Machine menu -#: ../src/vinagre-tab.c:931 ../src/vinagre-tab.c:932 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "স্ক্রিন-শট নিন" +#: ../vinagre/vinagre-tube-handler.c:232 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "পরিসেবার বৈশিষ্ট্য প্রাপ্ত করা অসম্ভব: %s" -#: ../src/vinagre-tab.c:940 ../src/vinagre-tab.c:941 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del প্রেরণ করা হবে" +#: ../vinagre/vinagre-tube-handler.c:289 +#, c-format +#| msgid "Failed to create the directory" +msgid "Impossible to create the connection: %s" +msgstr "সংযোগ নির্মাণ করা অসম্ভব: %s" -#: ../src/vinagre-tab.c:1065 -msgid "Desktop Name:" -msgstr "ডেস্কটপের নাম:" +#: ../vinagre/vinagre-tube-handler.c:328 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "স্ট্রিম টিউব গ্রহণ করা অসম্ভব: %s" -#: ../src/vinagre-tab.c:1067 -msgid "Port:" -msgstr "পোর্ট:" +#: ../vinagre/vinagre-tube-handler.c:404 +#, c-format +#| msgid "Failed to resolve avahi hostname: %s\n" +msgid "Failed to request name: %s" +msgstr "নামের অনুরোধ জানাতে ব্যর্থ: %s" -#: ../src/vinagre-tab.c:1068 -msgid "Dimensions:" -msgstr "দিকমাত্রা:" +#: ../vinagre/vinagre-tube-handler.c:405 +msgid "No error given" +msgstr "কোনো ত্রুটি উল্লিখিত হয়নি" -#: ../src/vinagre-tab.c:1134 -#| msgid "Take a screenshot of active connection" -msgid "Could not get a screenshot of the connection." -msgstr "বর্তমান সংযোগের স্ক্রিন-শট প্রাপ্ত করা সম্ভব হয়নি।" +#: ../vinagre/vinagre-tube-handler.c:482 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "যোগাযোগকারীর নাম প্রাপ্ত করতে ব্যর্থ: %s" -#: ../src/vinagre-tab.c:1142 +#: ../vinagre/vinagre-tube-handler.c:517 #, c-format -msgid "Screenshot of %s" -msgstr "%s-র স্ক্রিন-শট" +msgid "Impossible to get the avatar: %s" +msgstr "অবতার প্রাপ্ত করা অসম্ভব: %s" -#: ../src/vinagre-tab.c:1145 -msgid "Save Screenshot" -msgstr "স্ক্রিন-শট সংরক্ষণ করুন" +#: ../vinagre/vinagre-tube-handler.c:538 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s আপনার সাথে নিজের ডেস্কটপটি যৌথরূপে ব্যবহার করতে ইচ্ছুক।" -#: ../src/vinagre-tab.c:1209 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"বর্তমান ইনস্টলেশনের ক্ষেত্রে মাপ নির্ধারণ সমর্থিত নয়।\n" -"\n" -"এই বৈশিষ্ট্য সক্রিয় করার প্রণালী সম্বন্ধে জানার জন্য (Vinagre-র সাথে উপলব্ধ) README " -"ফাইল পড়ুন।" +#: ../vinagre/vinagre-tube-handler.c:543 +msgid "Desktop sharing invitation" +msgstr "ডেস্কটপ যৌথরূপে ব্যবহার করার আমন্ত্রণ" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "মেশিন (_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "সম্পাদনা (_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "প্রদর্শন (_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "বুকমার্ক সংকলন (_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "দূরবর্তী মেশিনের সাথে সংযোগ স্থাপন করুন" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "একটি .VNC ফাইল খুলুন" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "এই প্রোগ্রাম থেকে বেরিয়ে আসুন" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "অ্যাপ্লিকেশন সংক্রান্ত পছন্দসই মান পরিবর্তন করুন" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "বুকমার্ক খুলুন (_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "এই মেশিনের সাথে সংযোগ স্থাপন করুন" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "বুকমার্ক সম্পাদন করুন (_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "পছন্দ করা বুকমার্কটি সম্পাদন করুন" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "বুকমার্ক থেকে সরিয়ে ফেলুন (_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "বর্তমানে পছন্দ করা সংযোগটি বুকমার্ক থেকে মুছে ফেলুন" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "নতুন ফোল্ডার (_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "নতুন ফোল্ডার নির্মাণ করুন" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "বিষয়বস্তু (_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "vinagre-র সহায়িকা খুলুন" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "অ্যাপ্লিকেশন পরিচিতি" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "টুল-বার (_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "টুল-বার প্রদর্শন করুন অথবা আড়াল করুন" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "স্ট্যাটাস-বার(_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "স্ট্যাটাস-বার প্রদর্শন করুন অথবা আড়াল করুন" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "পার্শ্ববর্তী প্যানেল (_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "পার্শ্ববর্তী প্যানেল প্রদর্শন করুন অথবা আড়াল করুন" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "বর্তমান সংযোগটি বন্ধ করুন" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "সমগ্র বন্ধ করুন (_l)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "সকল সক্রিয় সংযোগ বন্ধ করুন" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "বুকমার্কে যোগ করুন (_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "বর্তমান সংযোগটি বুকমার্কে যোগ করুন" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "স্ক্রিন-শট নিন" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "বর্তমান সংযোগের স্ক্রিন-শট নিন" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "সক্রিয় সংযোগের জন্য Ctrl+Alt+Del প্রেরণ করুন" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "বর্তমান মেশিনটিকে সম্পূর্ণ পর্দা জুড়ে প্রদর্শন করুন" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "মূল মাপ (_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "দূরবর্তী ডেস্কটপের মাপ অনুযায়ী উইন্ডোর মাপ নির্ধারণ করতে ব্যবহৃত হয়" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "মাপ নির্ধারণ (_c)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "দূরবর্তী পর্দাটি বর্তমান উইন্ডোর মাপ অনুযায়ী নির্ধারণ করা হবে" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "শুধুমাত্র পাঠযোগ্য (_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "মাউস ও কি-বোর্ড নিষ্ক্রিয় করা হবে" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "টুল-বার (_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "টুল-বার প্রদর্শন করুন অথবা আড়াল করুন" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "স্ট্যাটাস-বার(_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "স্ট্যাটাস-বার প্রদর্শন করুন অথবা আড়াল করুন" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "পার্শ্ববর্তী প্যানেল (_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "পার্শ্ববর্তী প্যানেল প্রদর্শন করুন অথবা আড়াল করুন" - -#: ../src/vinagre-utils.c:75 -#| msgid "The following error has occurred:" -#| msgid_plural "The following errors have occurred:" +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "ত্রুটি উৎপন্ন হয়েছে:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "GNOME ডেস্কটপে ব্যবহারযোগ্য VNC ক্লায়েন্ট, Vinagre" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +#| msgid "Could not open the file." +msgid "Could not load builder file: %s" +msgstr "বিল্ডার ফাইল লোড করতে ব্যর্থ: %s" + +#: ../vinagre/vinagre-utils.c:453 +#| msgid "Vinagre is a VNC client for the GNOME Desktop" +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "GNOME ডেস্কটপে ব্যবহারযোগ্য দূরবর্তী ডেস্কটপ প্রদর্শন ব্যবস্থা, Vinagre" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -757,7 +984,7 @@ "General Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের " "সংস্করণ ২ অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।" -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -768,7 +995,7 @@ "জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম সাধনের জন্য " "অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত। অধিক জানতে GNU General Public License পড়ুন।" -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -776,30 +1003,26 @@ "এই প্রোগ্রামের সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া " "উচিত; না থাকলে পৃষ্ঠা দেখুন।" -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "সঙ্কর্ষণ মুখোপাধ্যায় (sankarshan.mukhopadhyay@gmail.com)" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre ওয়েবসাইট" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml একত্রিত করা যায়নি: %s " -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "সম্প্রতি ব্যবহৃত সংযোগ (_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s খুলুন:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "কার্সারের জন্য Ctrl+Alt ব্যবহার করুন" - diff -Nru vinagre-2.26.1/po/bn.po vinagre-2.29.1/po/bn.po --- vinagre-2.26.1/po/bn.po 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/po/bn.po 2009-09-01 12:16:41.000000000 +0100 @@ -0,0 +1,1005 @@ +# Bengali translation of vinagre. +# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Sankarshan Mukhopadhyay , 2007, 2008. +# Runa Bhattacharjee , 2008, 2009. +# Maruf Ovee , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: vinagre\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=vinagre&component=general\n" +"POT-Creation-Date: 2009-08-31 18:44+0000\n" +"PO-Revision-Date: 2009-08-31 11:08+0700\n" +"Last-Translator: Maruf Ovee \n" +"Language-Team: Bengali \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 +msgid "_About" +msgstr "পরিচিতি (_A)" + +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 +msgid "_Help" +msgstr "সাহায্য (_H)" + +#: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 +msgid "Access remote desktops" +msgstr "দূরবর্তী ডেস্কটপের সাথে সংযোগ করুন" + +#: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 +msgid "Remote Desktop Viewer" +msgstr "দূরবর্তী ডেস্কটপ প্রদর্শন ব্যবস্থা" + +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "উপরোক্ত সকল ক্ষেত্রে মান পূরণ করা আবশ্যক" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "পরিচয় প্রমাণ করা আবশ্যক" + +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 +msgid "Bookmarks" +msgstr "বুকমার্ক সংকলন" + +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "সংযোগ স্থাপন করা হচ্ছে" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "সংযোগ সংক্রান্ত অপশন" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "ফোল্ডার" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 +msgid "Host:" +msgstr "হোস্ট:" + +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "ইন্টারফেস" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "অপশন" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "প্যারেন্ট ফোল্ডার" + +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "পছন্দ" + +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "কোন মেশিনের সাথে সংযোগ স্থাপন করতে আপনি ইচ্ছুক?" + +#: ../data/vinagre.ui.h:13 +msgid "_Always show tabs" +msgstr "সর্বদা ট্যাব প্রদর্শন করা হবে (_A)" + +#. This is a button label, in the authentication dialog +#: ../data/vinagre.ui.h:15 +msgid "_Authenticate" +msgstr "অনুমোদন (_A)" + +#: ../data/vinagre.ui.h:16 +msgid "_Full screen" +msgstr "সম্পূর্ণ পর্দায় প্রদর্শন (_F)" + +#: ../data/vinagre.ui.h:17 +msgid "_Host:" +msgstr "হোস্ট:(_H)" + +#: ../data/vinagre.ui.h:18 +msgid "_Name:" +msgstr "নাম:(_N)" + +#: ../data/vinagre.ui.h:19 +msgid "_Password:" +msgstr "পাসওয়ার্ড:(_P)" + +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "প্রোটোকল: (_P)" + +#: ../data/vinagre.ui.h:21 +msgid "_Remember this credential" +msgstr "এই পরিচয় মনে রাখা হবে (_R)" + +#: ../data/vinagre.ui.h:22 +msgid "_Show menu shortcuts" +msgstr "মেনুর শর্ট-কাট প্রদর্শন করা হবে (_S)" + +#: ../data/vinagre.ui.h:23 +msgid "_Username:" +msgstr "ব্যবহারকারীর নাম: (_U)" + +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "সক্রিয় প্লাগ-ইন" + +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"সক্রিয় প্লাগ-ইনের তালিকা। এর মধ্যে সক্রিয় প্লাগ-ইনের \"অবস্থান\" অন্তর্ভুক্ত রয়েছে। " +"কোনো সুনির্দিষ্ট প্লাগ-ইনের \"অবস্থান\" জানার জন্য .vinagre-plugin ফাইলটি দেখুন।" + +#: ../data/vinagre.schemas.in.in.h:3 +msgid "Maximum number of history items in connect dialog" +msgstr "সংযোগের ডায়লগ বক্সের মধ্যে প্রদর্শনযোগ্য পূর্ববর্তী তথ্যের সর্বাধিক তালিকা" + +#: ../data/vinagre.schemas.in.in.h:4 +msgid "" +"Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " +"Note that if they are enabled, those keys will be intercepted by the menu " +"and will not be sent to the remote host." +msgstr "" +"মেনু শর্ট-কাট নিষ্ক্রিয় করার জন্য \"false\" নির্ধারণ করুন। শর্ট-কাট সক্রিয় করার জন্য " +"\"true\" নির্ধারণ করুন। উল্লেখ্য, এইগুলো সক্রিয় করা হলে, মেনু দ্বারা এই কি-গুলির কর্ম " +"সনাক্ত ও গ্রহণ করা হবে এবং দূরবর্তী হোস্টকে পাঠানো হবে না।" + +#: ../data/vinagre.schemas.in.in.h:5 +msgid "" +"Set to \"true\" to always show the tabs. Set to \"false\" to only show the " +"tabs when there is more than one active connection." +msgstr "" +"মান \"true\" নির্ধারণ করা হলে সর্বদা ট্যাব প্রদর্শন করা হবে। শুধুমাত্র একাধিক সক্রিয় " +"সংযোগ উপস্থিত থাকলে ট্যাব প্রদর্শনের জন্য মান \"false\" নির্ধারণ করুন।" + +#: ../data/vinagre.schemas.in.in.h:6 +msgid "Specifies the maximum number of items in the host dropdown entry." +msgstr "হোস্ট ড্রপ-ডাউন এনট্রির মধ্যে প্রদর্শনযোগ্য তথ্যের সর্বাধিক সংখ্যা।" + +#: ../data/vinagre.schemas.in.in.h:7 +msgid "The handler for \"vnc://\" URLs" +msgstr " \"vnc://\" URL এর হ্যান্ডলার" + +#: ../data/vinagre.schemas.in.in.h:8 +msgid "" +"When connecting to a host, the client can say to the server to leave other " +"clients connected or to drop the existent connections. Set the value to true " +"to share the desktop with the other clients." +msgstr "" +"হোস্টের সাথে সংযোগ স্থাপন করার সময়, ক্লায়েন্ট সিস্টেম দ্বারা সার্ভারকে অন্যান্য সংযুক্ত " +"ক্লায়েন্টের সাথে সংযোগ বিচ্ছিন্ন করতে অথবা না করতে অনুরোধ করা যেতে পারে। অন্যান্য " +"ক্লায়েন্টের সাথে ডেস্কটপ যৌথরূপে ব্যবহারের জন্য মান true নির্ধারণ করুন।" + +#: ../data/vinagre.schemas.in.in.h:9 +msgid "Whether we should leave other clients connected" +msgstr "অন্যান্য ক্লায়েন্টের সংযোগ অপরিবর্তিত থাকবে কি না" + +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "শুধুমাত্র একটি সক্রিয় সংযোগ থাকলে ট্যাব প্রদর্শন করা হবে কি না" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "মেনু অ্যাকসেলেরেটর (শর্টকাট-কি) প্রদর্শন করা হবে কি না" + +#: ../data/vinagre-mime.xml.in.h:1 +msgid "Remote Desktop (VNC) file" +msgstr "দূরবর্তী ডেস্কটপ (VNC) ফাইল" + +#: ../data/vinagre-mime.xml.in.h:2 +msgid "Remote Desktop Connection" +msgstr "দূরবর্তী ডেস্কটপ সংযোগ" + +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux টার্মিন্যাল ব্যবহার করুন" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "পোর্ট:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH সমর্থন ব্যবস্থা" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"'shared' শীর্ষক ফ্ল্যাগের মান সঠিক নয়: %d। এই ক্ষেত্রে 0 (০) অথবা 1 (১) মান হওয়া " +"উচিত। উল্লিখিত মান উপেক্ষা করা হবে।" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Enable scaled mode" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC Options:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Show VNC Options" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows ও অন্যান্য মেশিন ব্যবহার করুন।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "ফাইল পার্স করতে ব্যর্থ।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "এটি VNC ফাইল নয়: \"connection\" দলটি অনুপস্থিত" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "এটি VNC ফাইল নয়: \"host\" কি অনুপস্থিত" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC সংক্রান্ত অপশন" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "শুধুমাত্র প্রদর্শন (_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "মাপ নির্ণয় (_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC-এর ফাইল" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "ডেস্কটপের নাম:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "দিকমাত্রা:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "হোস্টের সাথে সংযোগ স্থাপনে ত্রুটি ঘটেছে" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "হোস্ট %1$s-এর সাথে পরিচয় প্রমাণের পদ্ধতি সমর্থিত নয়। (%2$u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "অনুমোদনের পদ্ধতি সমর্থিত নয়" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "অনুমোদন সংক্রান্ত সমস্যা" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "এই মেশিনটি ব্যবহারের জন্য ব্যবহারকারীর নাম প্রয়োগ করা আবশ্যক।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "এই মেশিনটি ব্যবহারের জন্য পাসওয়ার্ড প্রয়োগ করা আবশ্যক।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "মাপ নির্ধারণ (_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "দূরবর্তী পর্দাটি বর্তমান উইন্ডোর মাপ অনুযায়ী নির্ধারণ করা হবে" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "মাউস ও কe-বোর্ড থেকে উৎপন্ন ইভেন্ট পাঠানো হবে না" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "মূল মাপ (_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "দূরবর্তী ডেস্কটপের মাপ অনুযায়ী উইন্ডোর মাপ নির্ধারণ করতে ব্যবহৃত হয়" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del পাঠানো হবে" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "দূরবর্তী মেশিনে Ctrl+Alt+Del সংকেত পাঠানো হয়" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "মাপ নির্ধারণ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "শুধুমাত্র পাঠযোগ্য" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"বর্তমান ইনস্টলেশনের ক্ষেত্রে মাপ নির্ধারণ সমর্থিত নয়।\n" +"\n" +"এই বৈশিষ্ট্য সক্রিয় করার প্রণালী সম্বন্ধে জানার জন্য (Vinagre-এর সাথে উপলব্ধ) README " +"ফাইল পড়ুন।" + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC সমর্থন" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 +msgid "A menu to quickly access remote machines" +msgstr "দূরবর্তী মেশিনের সাথে দ্রুত সংযোগ স্থাপনের মেনু" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 +msgid "Vinagre Applet Factory" +msgstr "Vinagre অ্যাপলেট ফ্যাক্টরি" + +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 +msgid "Could not run vinagre:" +msgstr "vinagre চালাতে ব্যর্থ:" + +#: ../vinagre/vinagre-applet.c:380 +msgid "Open Remote Desktop Viewer" +msgstr "দূরবর্তী ডেস্কটপ প্রদর্শন ব্যবস্থা আরম্ভ করুন" + +#: ../vinagre/vinagre-applet.c:435 +msgid "Access your bookmarks" +msgstr "বুকমার্ক প্রয়োগ করুন" + +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "প্রোটোকল %s সমর্থিত নয়" + +#: ../vinagre/vinagre-bookmarks.c:343 +#, c-format +msgid "Error while initializing bookmarks: %s" +msgstr "বুকমার্ক শুরু করতে ত্রুটি ঘটেছে: %s" + +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 +msgid "Unknown error" +msgstr "অজানা ত্রুটি" + +#: ../vinagre/vinagre-bookmarks.c:350 +msgid "Error while initializing bookmarks: The file seems to be empty" +msgstr "বুকমার্ক প্রারম্ভ করতে ব্যর্থ: ফাইলটি সম্ভবত ফাঁকা" + +#: ../vinagre/vinagre-bookmarks.c:357 +msgid "" +"Error while initializing bookmarks: The file is not a vinagre bookmarks file" +msgstr "বুকমার্ক প্রারম্ভ করতে ব্যর্থ: এটি vinagre বুকমার্ক ফাইল নয়" + +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 +msgid "Error while saving bookmarks: Failed to create the XML structure" +msgstr "বুকমার্ক সংরক্ষণ করতে ব্যর্থ: XML বিন্যাস গঠন করতে ব্যর্থ" + +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 +msgid "Error while saving bookmarks: Failed to initialize the XML structure" +msgstr "বুকমার্ক সংরক্ষণ করতে ব্যর্থ: XML বিন্যাস আরম্ভ করতে ব্যর্থ" + +#: ../vinagre/vinagre-bookmarks.c:449 +msgid "Error while saving bookmarks: Failed to finalize the XML structure" +msgstr "বুকমার্ক সংরক্ষণ করতে ব্যর্থ: XML বিন্যাস নির্ধারণ করতে ব্যর্থ" + +#: ../vinagre/vinagre-bookmarks.c:458 +#, c-format +msgid "Error while saving bookmarks: %s" +msgstr "বুকমার্ক সংরক্ষণে ত্রুটি ঘটেছে: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 +msgid "Error while migrating bookmarks: Failed to create the XML structure" +msgstr "বুকমার্ক মাইগ্রেট করতে ব্যর্থ: XML বিন্যাস গঠন করতে ব্যর্থ" + +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 +msgid "Error while migrating bookmarks: Failed to initialize the XML structure" +msgstr "বুকমার্ক মাইগ্রেট করতে ব্যর্থ: XML বিন্যাস আরম্ভ করতে ব্যর্থ" + +#: ../vinagre/vinagre-bookmarks-migration.c:125 +msgid "Error while migrating bookmarks: Failed to finalize the XML structure" +msgstr "বুকমার্ক মাইগ্রেট করতে ব্যর্থ: XML বিন্যাস নির্ধারণ করতে ব্যর্থ" + +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 +#, c-format +msgid "Error while migrating bookmarks: %s" +msgstr "বুকমার্ক মাইগ্রেট করতে সমস্যা: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "বুকমার্ক মাইগ্রেট করতে সমস্যা: VNC প্লাগ-ইন সক্রিয় নয়" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 +msgid "Failed to create the directory" +msgstr "ডিরেক্টরি নির্মাণ করতে ব্যর্থ" + +#: ../vinagre/vinagre-bookmarks-migration.c:262 +msgid "" +"Migrating the bookmarks file to the new format. This operation is only " +"supposed to run once." +msgstr "" +"নতুন ফাইলের বিন্যাসে বুকমার্কগুলো মাইগ্রেট করা হচ্ছে। এই কাজ শুধুমাত্র একবার সঞ্চালিত " +"হবে।" + +#: ../vinagre/vinagre-bookmarks-migration.c:270 +#, c-format +msgid "Error opening old bookmarks file: %s" +msgstr "বুকমার্কের পুরোনো ফাইল খুলতে ব্যর্থ: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 +msgid "Migration cancelled" +msgstr "মাইগ্রেশন কর্ম বাতিল করা হয়েছে" + +#: ../vinagre/vinagre-bookmarks-migration.c:280 +msgid "Could not remove the old bookmarks file" +msgstr "পুরোনো বুকমার্কের ফাইল মুছে ফেলতে ব্যর্থ" + +#: ../vinagre/vinagre-bookmarks-tree.c:120 +msgid "Root Folder" +msgstr "Root ফোল্ডার" + +#: ../vinagre/vinagre-bookmarks-ui.c:78 +msgid "Invalid name for this folder" +msgstr "ফোল্ডারের নাম বৈধ নয়" + +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "" +"এই ফোল্ডারের মধ্যে \"%s\" নামটি বর্তমানে ব্যবহৃত হচ্ছে। অনুগ্রহ করে একটি ভিন্ন নাম " +"প্রয়োগ করুন।" + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "এই বস্তুর জন্য এই নাম বৈধ নয়" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(প্রোটোকল: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "আপনি কি নিশ্চিতরূপে %s-কে বুকমার্কের তালিকা থেকে সরিয়ে ফেলতে ইচ্ছুক?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 +msgid "Remove Folder?" +msgstr "ফোল্ডার মুছে ফেলা হবে কি?" + +#: ../vinagre/vinagre-bookmarks-ui.c:315 +msgid "Notice that all its subfolders and items will be removed as well." +msgstr "উল্লেখ্য, ডিরেক্টরির মধ্যে উপস্থিত সকল সাব-ফোল্ডার" + +#: ../vinagre/vinagre-bookmarks-ui.c:320 +msgid "Remove Item?" +msgstr "বস্তু মুছে ফেলা হবে কি?" + +#: ../vinagre/vinagre-bookmarks-ui.c:337 +msgid "Error removing bookmark: Entry not found" +msgstr "বুকমার্ক সরিয়ে ফেলতে ব্যর্থ: এনট্রি পাওয়া যায়নি" + +#: ../vinagre/vinagre-bookmarks-ui.c:354 +msgid "New Folder" +msgstr "নতুন ফোল্ডার" + +#: ../vinagre/vinagre-commands.c:120 +msgid "Choose the file" +msgstr "ফাইল বেছে নিন" + +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "কোনো সমর্থিত ফাইল নেই" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"কোনো সক্রিয় প্লাগ-ইন দ্বারা প্রদর্শনযোগ্য সমর্থিত ফাইল উপলব্ধ নেই। কেয়কটি প্লাগ-ইন " +"সক্রিয় করে পুনরায় প্রচেষ্টা করুন।" + +#: ../vinagre/vinagre-commands.c:181 +msgid "The following file could not be opened:" +msgid_plural "The following files could not be opened:" +msgstr[0] "নিম্নলিখিত ফাইল খোলা যায়নি:" +msgstr[1] "" + +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "প্রোটোকল তালিকা থেকে সক্রিয় প্রোটোকল পাওয়া যায়নি।" + +#: ../vinagre/vinagre-connect.c:313 +#, c-format +msgid "Error while saving history file: %s" +msgstr "পূর্ববর্তী তথ্যের ফাইল সংরক্ষণ করতে সমস্যা: %s" + +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "দূরবর্তী একটি ডেস্কটপ নির্বাচন করুন" + +#: ../vinagre/vinagre-connection.c:627 +msgid "Could not open the file." +msgstr "ফাইল খুলতে ব্যর্থ।" + +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "কোনো প্লাগ-ইন দ্বারা ফাইলটি সনাক্ত করা যায়নি।" + +#: ../vinagre/vinagre-fav.c:670 +msgid "Invalid operation" +msgstr "কর্ম বৈধ নয়" + +#: ../vinagre/vinagre-fav.c:671 +msgid "Data received from drag&drop operation is invalid." +msgstr "drag&drop (ড্র্যাগ ও ড্রপ) কর্ম থেকে প্রাপ্ত তথ্য বৈধ নয়।" + +#: ../vinagre/vinagre-fav.c:871 +msgid "Hosts nearby" +msgstr "নিকটবর্তী হোস্ট" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +#, fuzzy +msgid "Open vinagre in fullscreen mode" +msgstr "Open vinagre in fullscreen mode" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 +#, fuzzy +msgid "Create a new toplevel window in an existing instance of vinagre" +msgstr "Create a new toplevel window in an existing instance of vinagre" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +#, fuzzy +msgid "Open a file recognized by vinagre" +msgstr "Open a file recognized by vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "filename" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 +msgid "[server:port]" +msgstr "[server:port]" + +#: ../vinagre/vinagre-main.c:130 +msgid "The following error has occurred:" +msgid_plural "The following errors have occurred:" +msgstr[0] "নিম্নলিখিত ত্রুটি উৎপন্ন হয়েছে:" +msgstr[1] "নিম্নলিখিত ত্রুটি উৎপন্ন হয়েছে:" + +#. Setup command line options +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- দূরবর্তী ডেস্কটপ প্রদর্শন ব্যবস্থা" + +#: ../vinagre/vinagre-main.c:193 +msgid "" +"Run 'vinagre --help' to see a full list of available command line options" +msgstr "কম্যান্ড লাইন বিকল্পের সম্পুর্ণ তালিকার জন্য 'vinagre --help' ব্যবহার করুন" + +#: ../vinagre/vinagre-mdns.c:142 +#, c-format +msgid "Failed to resolve avahi hostname: %s\n" +msgstr "avahi হোস্ট-নেম মীমাংসা করতে ব্যর্থ: %s\n" + +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "%1$s প্লাগ-ইন দ্বারা %2$s পরিসেবার জন্য একটি ব্রাউজার নিবন্ধন করা হয়েছে।" + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "%s পরিসেবার জন্য mDNS ব্রাউজার যোগ করতে ব্যর্থ।" + +#: ../vinagre/vinagre-mdns.c:225 +#, c-format +msgid "Failed to browse for hosts: %s\n" +msgstr "হোস্ট ব্রাউজ করতে ব্যর্থ: %s\n" + +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS ব্রাউজার আরম্ভ করতে ব্যর্থ: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "হোস্ট %s-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে" + +#: ../vinagre/vinagre-notebook.c:463 +msgid "Connection closed" +msgstr "সংযোগ বিচ্ছিন্ন হয়েছে" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "হোস্ট %s-এ পরিচয় প্রমাণ করতে ব্যর্থ" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "পরিচয় প্রমাণ করতে ব্যর্থ" + +#: ../vinagre/vinagre-notebook.c:525 +msgid "Connecting..." +msgstr "সংযোগ স্থাপন করা হচ্ছে..." + +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 +msgid "Close connection" +msgstr "সংযোগ সমাপ্ত করুন" + +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "প্লাগ-ইন পরিচালন ব্যবস্থা" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "প্লাগ-ইন" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "সক্রিয়" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "কনফিগার করুন (_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "সক্রিয় করুন (_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "সমস্ত সক্রিয় করুন (_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "সমস্ত নিষ্ক্রিয় করুন (_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "প্লাগ-ইন পরিচিতি (_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "প্লাগ-ইন কনফিগার করুন (_o)" + +#: ../vinagre/vinagre-prefs.c:217 +msgid "Cannot initialize preferences manager." +msgstr "বিবিধ পছন্দের তালিকা শুরু করা সম্ভব হয়নি" + +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "সম্পূর্ণ পর্দায় প্রদর্শন বন্ধ করা হবে" + +#: ../vinagre/vinagre-tab.c:495 +msgid "Error saving recent connection." +msgstr "বর্তমান সংযোগ সংরক্ষণে ত্রুটি ঘটেছে।" + +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "কি-রিং এ পরিচয় সংরক্ষণে সমস্যা।" + +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "বর্তমান সংযোগের স্ক্রিন-শট প্রাপ্ত করা সম্ভব হয়নি।" + +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "স্ক্রিন-শট সংরক্ষণ করুন" + +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s-র স্ক্রিন-শট" + +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "পর্দার ছবি সংরক্ষণ করতে ত্রুটি" + +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "পরিসেবার বৈশিষ্ট্য প্রাপ্ত করা অসম্ভব: %s" + +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "সংযোগ নির্মাণ করা অসম্ভব: %s" + +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "স্ট্রিম টিউব গ্রহণ করা অসম্ভব: %s" + +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "যোগাযোগকারীর নাম প্রাপ্ত করতে ব্যর্থ: %s" + +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "অবতার প্রাপ্ত করা অসম্ভব: %s" + +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s আপনার সাথে নিজের ডেস্কটপটি যৌথরূপে ব্যবহার করতে ইচ্ছুক।" + +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "ডেস্কটপ যৌথরূপে ব্যবহার করার আমন্ত্রণ" + +#. Toplevel +#: ../vinagre/vinagre-ui.h:33 +msgid "_Machine" +msgstr "মেশিন (_M)" + +#: ../vinagre/vinagre-ui.h:34 +msgid "_Edit" +msgstr "সম্পাদনা (_E)" + +#: ../vinagre/vinagre-ui.h:35 +msgid "_View" +msgstr "প্রদর্শন (_V)" + +#: ../vinagre/vinagre-ui.h:36 +msgid "_Bookmarks" +msgstr "বুকমার্ক সংকলন (_B)" + +#: ../vinagre/vinagre-ui.h:41 +msgid "Connect to a remote machine" +msgstr "দূরবর্তী মেশিনের সাথে সংযোগ স্থাপন করুন" + +#: ../vinagre/vinagre-ui.h:43 +msgid "Open a .VNC file" +msgstr "একটি .VNC ফাইল খুলুন" + +#: ../vinagre/vinagre-ui.h:45 +msgid "Quit the program" +msgstr "এই প্রোগ্রাম থেকে বেরিয়ে আসুন" + +#: ../vinagre/vinagre-ui.h:49 +msgid "Edit the application preferences" +msgstr "অ্যাপ্লিকেশন সংক্রান্ত পছন্দসই মান পরিবর্তন করুন" + +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. +#. Bookmarks menu +#: ../vinagre/vinagre-ui.h:56 +msgid "_Open bookmark" +msgstr "বুকমার্ক খুলুন (_O)" + +#: ../vinagre/vinagre-ui.h:57 +msgid "Connect to this machine" +msgstr "এই মেশিনের সাথে সংযোগ স্থাপন করুন" + +#: ../vinagre/vinagre-ui.h:58 +msgid "_Edit bookmark" +msgstr "বুকমার্ক সম্পাদন করুন (_E)" + +#: ../vinagre/vinagre-ui.h:59 +msgid "Edit the details of selected bookmark" +msgstr "পছন্দ করা বুকমার্কটি সম্পাদন করুন" + +#: ../vinagre/vinagre-ui.h:60 +msgid "_Remove from bookmarks" +msgstr "বুকমার্ক থেকে সরিয়ে ফেলুন (_R)" + +#: ../vinagre/vinagre-ui.h:61 +msgid "Remove current selected connection from bookmarks" +msgstr "বর্তমানে পছন্দ করা সংযোগটি বুকমার্ক থেকে মুছে ফেলুন" + +#: ../vinagre/vinagre-ui.h:62 +msgid "_New Folder" +msgstr "নতুন ফোল্ডার (_N)" + +#: ../vinagre/vinagre-ui.h:63 +msgid "Create a new folder" +msgstr "নতুন ফোল্ডার নির্মাণ করুন" + +#. Help menu +#: ../vinagre/vinagre-ui.h:66 +msgid "_Contents" +msgstr "বিষয়বস্তু (_C)" + +#: ../vinagre/vinagre-ui.h:67 +msgid "Open the vinagre manual" +msgstr "vinagre-এর সহায়িকা খুলুন" + +#: ../vinagre/vinagre-ui.h:69 +msgid "About this application" +msgstr "অ্যাপ্লিকেশন পরিচিতি" + +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "টুল-বার (_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "টুল-বার প্রদর্শন করুন অথবা আড়াল করুন" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "স্ট্যাটাস-বার (_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "স্ট্যাটাস-বার প্রদর্শন করুন অথবা আড়াল করুন" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "পার্শ্ববর্তী প্যানেল (_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "পার্শ্ববর্তী প্যানেল প্রদর্শন করুন অথবা আড়াল করুন" + +#: ../vinagre/vinagre-ui.h:91 +msgid "Close the current connection" +msgstr "বর্তমান সংযোগটি বন্ধ করুন" + +#: ../vinagre/vinagre-ui.h:92 +msgid "C_lose All" +msgstr "সমগ্র বন্ধ করুন (_l)" + +#: ../vinagre/vinagre-ui.h:93 +msgid "Close all active connections" +msgstr "সকল সক্রিয় সংযোগ বন্ধ করুন" + +#. Bookmarks menu +#: ../vinagre/vinagre-ui.h:96 +msgid "_Add to bookmarks" +msgstr "বুকমার্কে যোগ করুন (_A)" + +#: ../vinagre/vinagre-ui.h:97 +msgid "Add current connection to your bookmarks" +msgstr "বর্তমান সংযোগটি বুকমার্কে যোগ করুন" + +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "স্ক্রিন-শট নিন" + +#: ../vinagre/vinagre-ui.h:105 +msgid "Take a screenshot of active connection" +msgstr "বর্তমান সংযোগের স্ক্রিন-শট নিন" + +#: ../vinagre/vinagre-ui.h:109 +msgid "View the current machine in full screen" +msgstr "বর্তমান মেশিনটিকে সম্পূর্ণ পর্দা জুড়ে প্রদর্শন করুন" + +#: ../vinagre/vinagre-utils.c:75 +msgid "An error has occurred:" +msgstr "ত্রুটি উৎপন্ন হয়েছে:" + +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "বিল্ডার ফাইল লোড করতে ব্যর্থ: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "GNOME ডেস্কটপে ব্যবহারযোগ্য দূরবর্তী ডেস্কটপ প্রদর্শন ব্যবস্থা, Vinagre" + +#: ../vinagre/vinagre-utils.c:456 +msgid "" +"Vinagre 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 "" +"Vinagre একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU " +"General Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের " +"সংস্করণ ২ অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।" + +#: ../vinagre/vinagre-utils.c:460 +msgid "" +"Vinagre 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 "" +"Vinagre বিতরণ করার মূল উদ্দেশ্য যে ব্যবহারকারীরা এর দ্বারা উপকৃত হবেন, কিন্তু এটির " +"জন্য কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কাজ সাধনের জন্য " +"অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত। অধিক জানতে GNU General Public License পড়ুন।" + +#: ../vinagre/vinagre-utils.c:464 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"this program. If not, see ." +msgstr "" +"এই প্রোগ্রামের সাথে GNU General Public License-এর একটি প্রতিলিপি উপলব্ধ হওয়া " +"উচিত; না থাকলে পৃষ্ঠা দেখুন।" + +#: ../vinagre/vinagre-utils.c:486 +msgid "translator-credits" +msgstr "সঙ্কর্ষণ মুখোপাধ্যায় (sankarshan.mukhopadhyay@gmail.com)" + +#: ../vinagre/vinagre-utils.c:489 +msgid "Vinagre Website" +msgstr "Vinagre ওয়েবসাইট" + +#: ../vinagre/vinagre-window.c:397 +#, c-format +msgid "Could not merge vinagre-ui.xml: %s" +msgstr "vinagre-ui.xml একত্রিত করা যায়নি: %s " + +#: ../vinagre/vinagre-window.c:425 +msgid "_Recent connections" +msgstr "সম্প্রতি ব্যবহৃত সংযোগ (_R)" + +#. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu +#: ../vinagre/vinagre-window.c:585 +#, c-format +msgid "Open %s:%d" +msgstr "%1$s খুলুন:%2$d" diff -Nru vinagre-2.26.1/po/ca.po vinagre-2.29.1/po/ca.po --- vinagre-2.26.1/po/ca.po 2009-03-26 18:20:03.000000000 +0000 +++ vinagre-2.29.1/po/ca.po 2009-09-30 17:53:19.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: vinagre\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-21 14:04+0100\n" -"PO-Revision-Date: 2009-03-21 14:05+0100\n" +"POT-Creation-Date: 2009-09-21 00:41+0200\n" +"PO-Revision-Date: 2009-09-09 20:26+0100\n" "Last-Translator: Joan Duran \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -16,11 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Quant a" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "A_juda" @@ -29,126 +29,121 @@ msgstr "Accés a escriptoris remots" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Visualitzador d'escriptoris remots" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Cal autenticació" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Opcions de connexió" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Connexió" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Carpeta" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interfície" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Opcions" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Carpeta pare" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "A quin ordinador us voleu connectar?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Tots els camps de sobre són obligatoris" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Tots els camps de sobre són obligatoris" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Cal autenticació" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Adreces d'interès" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Connexió" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Opcions de connexió" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Carpeta" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Ordinador:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interfície" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Opcions" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Carpeta pare" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Preferències" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Si s'haurien de mostrar les pestanyes encara que només hi hagi una connexió " -"activa" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Si s'haurien de mostrar els acceleradors del menú (dreceres de teclat)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "A quin ordinador us voleu connectar?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Mostra sempre les pestanyes" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Autentica" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "Pantalla _completa" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Ordinador:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nom:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Contrasenya:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protocol:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Recorda aquesta credencial" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "E_scalat" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Mostra les dreceres del menú" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Nom d'usuari:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Només _visualitza" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Connectors actius" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "ordinador o ordinador:pantalla o ordinador::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Llista de connectors actius. Aquesta conté la «Ubicació» dels connectors " +"actius. Vegeu el fitxer .vinagre-plugin per a obtenir la «Ubicació» d'un " +"connector donat." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Nombre màxim d'elements de l'historial en el diàleg de connexió" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -159,7 +154,7 @@ "habilitades, aquestes tecles sempre seran interceptades pel menú i no " "s'enviaran a l'ordinador remot." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -168,16 +163,16 @@ "«false» (fals) per a mostrar les pestanyes només quan hi hagi més d'una " "connexió activa." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Especifica el nombre màxim d'elements en l'entrada desplegable d'ordinadors." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "El gestor per a URL tipus «vnc://»" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -187,10 +182,21 @@ "els altres clients connectats o que abandoni les altres connexions. Establiu " "el valor a cert per a compartir l'escriptori amb altres clients." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Si s'haurien de mantenir els altres clients connectats" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Si s'haurien de mostrar les pestanyes encara que només hi hagi una connexió " +"activa" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Si s'haurien de mostrar els acceleradors del menú (dreceres de teclat)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Fitxer d'escriptori remot (VNC)" @@ -199,106 +205,288 @@ msgid "Remote Desktop Connection" msgstr "Connexió a un escriptori remot" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Accediu a terminals UNIX/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Compatibilitat per a SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Valor incorrecte per a l'indicador «compartit»: %d. Hauria de ser 0 o 1. " +"S'ignorarà." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Habilita el mode escalat" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Opcions del VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Mostra les opcions del VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Accedeix a ordinadors UNIX/Linux, Windows i altres." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "No s'ha pogut analitzar el fitxer." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "El fitxer no és del VNC: manca el grup «connection»." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "El fitxer no és del VNC: manca la clau «host»." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Opcions del VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Només _visualitza" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "E_scalat" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Fitxers del VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nom de l'escriptori:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensions:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "S'ha produït un error en connectar-se a l'ordinador." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "El mètode d'autenticació a l'ordinador %s no és compatible. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Autenticació no compatible" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Error d'autenticació" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Cal un nom d'usuari per a poder accedir a aquest ordinador." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Cal una contrasenya per a poder accedir a aquest ordinador." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "Es_calat" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Ajusta la pantalla remota a la mida actual de la finestra" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "No envia els esdeveniments del ratolí ni del teclat" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Mida original" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Ajusta la finestra a la mida de l'escriptori remot" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Envia Ctrl-Alt-Supr" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Envia Ctrl+Alt+Supr a l'ordinador remot" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Escalat" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Només lectura" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"L'escalat no funciona en aquesta instal·lació.\n" +"\n" +"Llegiu el fitxer README (distribuït amb el Vinagre) per a saber com " +"habilitar aquesta funció." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Compatibilitat per a VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Un menú per a accedir ràpidament a ordinadors remots" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Fàbrica de miniaplicacions del Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "No s'ha pogut executar el Vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Obre el visualitzador d'escriptoris remots" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Accedeix a les adreces d'interès" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "El protocol %s no és compatible." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "S'ha produït un error en inicialitzar les adreces d'interès: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Error desconegut" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "" "S'ha produït un error en inicialitzar les adreces d'interès: sembla ser que " "el fitxer és buit" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "S'ha produït un error en inicialitzar les adreces d'interès: el fitxer no és " "un fitxer d'adreces d'interès del Vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "" "S'ha produït un error en desar les adreces d'interès: no s'ha pogut crear " "l'estructura XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "S'ha produït un error en desar les adreces d'interès: no s'ha pogut " "inicialitzar l'estructura XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "S'ha produït un error en desar les adreces d'interès: no s'ha pogut " "finalitzar l'estructura XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "S'ha produït un error en desar les adreces d'interès: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "S'ha produït un error en migrar les adreces d'interès: no s'ha pogut crear " "l'estructura XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "S'ha produït un error en migrar les adreces d'interès: no s'ha pogut " "inicialitzar l'estructura XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "S'ha produït un error en migrar les adreces d'interès: no s'ha pogut " "finalitzar l'estructura XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "S'ha produït un error en migrar les adreces d'interès: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" +"S'ha produït un error en migrar les adreces d'interès: el connector VNC no " +"està activat" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "No s'ha pogut crear el directori" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -306,466 +494,487 @@ "S'està migrant el fitxer d'adreces d'interès al format nou. Aquesta operació " "només s'hauria d'executar una vegada." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "" "S'ha produït un error en obrir el fitxer d'adreces d'interès antigues: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "S'ha cancel·lat la migració" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "No s'ha pogut suprimir el fitxer d'adreces d'interès antic" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Carpeta arrel" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "El nom per a aquesta carpeta no és vàlid" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." -msgstr "" -"Ja s'utilitza el nom «%s» en aquest directori. Utilitzeu-ne un altre." +msgstr "Ja s'utilitza el nom «%s» en aquest directori. Utilitzeu-ne un altre." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "El nom per a aquest element no és vàlid" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protocol: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Segur que voleu suprimir %s de les adreces d'interès?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Segur que voleu suprimir %s de les adreces d'interès?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Voleu suprimir la carpeta?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "" "Tingueu en compte que també se suprimiran totes les subcarpetes i elements." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Voleu suprimir l'element?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "" "S'ha produït un error en suprimir l'adreça d'interès: no s'ha trobat " "l'entrada" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Carpeta nova" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Seleccioneu el fitxer" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Formats admesos" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "No hi ha fitxers compatibles" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Cap dels connectors actius ofereixen compatibilitat per al fitxer a obrir. " +"Activeu alguns connectors i torneu-ho a provar." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "No s'ha pogut obrir el fitxer següent:" msgstr[1] "No s'han pogut obrir els fitxers següents:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "No s'ha pogut obtenir el protocol actiu de la llista de protocols." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "S'ha produït un error en desar el fitxer de l'historial: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Seleccioneu un servidor de VNC" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Trieu un escriptori remot" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "El protocol %s no és compatible." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "No s'ha pogut obrir el fitxer." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "No s'ha pogut analitzar el fitxer." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Valor incorrecte per a l'indicador «compartit»: %d. Hauria de ser 0 o 1. " -"S'ignorarà." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Cap dels connectors ha reconegut el fitxer." -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "No s'ha pogut trobar l'adreça de l'ordinador al fitxer." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Operació no vàlida" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "" "Les dades rebudes de l'operació d'arrossegar i deixar anar no són vàlides." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Ordinadors propers" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Obre un fitxer .vnc" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "nomdelfitxer" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Obre el Vinagre en pantalla completa" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "" "Crea una finestra de nivell superior nova en una instància actual del Vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Obre un fitxer reconegut pel Vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "nomdelfitxer" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[servidor:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "S'ha produït l'error següent:" msgstr[1] "S'han produït els errors següents:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- Client de VNC del GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Visualitzador d'escriptoris remots" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Executeu «vinagre --help» per a veure una llista completa de les opcions " "disponibles en la línia d'ordres" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "No s'ha pogut resoldre el nom Avahi de l'ordinador: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "El connector %s ja ha registrat un navegador per al servei %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "No s'ha pogut afegir el navegador mDNS per al servei %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "No s'han pogut explorar els ordinadors: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "No s'ha pogut inicialitzar el navegador mDNS: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "S'ha tancat la connexió amb l'ordinador %s." +msgid "Connection to host %s was closed." +msgstr "S'ha tancat la connexió amb l'ordinador %s." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "S'ha tancat la connexió" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Ha fallat l'autenticació a l'ordinador %s" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Ha fallat l'autenticació" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "S'està connectant..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Tanca la connexió" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Gestor de connectors" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Connector" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Habilitat" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "C_onfigura" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ctiva" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ac_tiva'ls tots" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Desactiva'ls tots" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Quant al connector" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "C_onfigura el connector" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "No es pot inicialitzar el gestor de preferències." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "S'ha produït un error en connectar-se a l'ordinador." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Ha fallat l'autenticació a l'ordinador %s" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Ha fallat l'autenticació" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "" -"El mètode d'autenticació a l'ordinador %s no és compatible. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Autenticació no compatible" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Surt de la pantalla completa" -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "S'ha produït un error en desar la connexió recent." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "S'ha produït un error en desar la credencial a l'anell de claus." - -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Error d'autenticació" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Cal un nom d'usuari per a poder accedir a aquest ordinador." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Cal una contrasenya per a poder accedir a aquest ordinador." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "S'ha produït un error en desar les credencials a l'anell de claus." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimitza la finestra" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "No s'ha pogut obtenir una captura de pantalla de la connexió." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Escalat" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Desa la captura de pantalla" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Només lectura" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Captura de pantalla de %s" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Fes una captura de pantalla" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "S'ha produït un error en desar la captura de pantalla" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Envia Ctrl-Alt-Supr" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "No es pot obtenir la propietat del servei: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Nom de l'escriptori:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "No es pot crear la connexió: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "No es pot acceptar el flux del tub: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensions:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "No es pot obtenir el nom de contacte: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "No s'ha pogut obtenir una captura de pantalla de la connexió." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "No es pot obtenir l'avatar: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "Captura de pantalla de %s" +msgid "%s wants to share his desktop with you." +msgstr "%s vol compartir el seu escriptori." -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Desa la captura de pantalla" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"L'escalat no funciona en aquesta instal·lació.\n" -"\n" -"Llegiu el fitxer README (distribuït amb el Vinagre) per a saber com " -"habilitar aquesta funció." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Invitació de compartició de l'escriptori" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Ordinador" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Edita" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Visualitza" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Adreces d'interès" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Connectar-se a un ordinador remot" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Obre un fitxer .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Surt del programa" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Edita les preferències de l'aplicació" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Obre una adreça d'interès" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Connecta't a aquest ordinador" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Edita una adreça d'interès" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Edita els detalls de l'adreça d'interès seleccionada" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Suprimeix de les adreces d'interès" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Suprimeix la connexió seleccionada de les adreces d'interès" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Carpeta nova" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Crea una carpeta nova" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Continguts" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Obre el manual del Vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Quant a l'aplicació" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Barra d'eines" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Mostra o amaga la barra d'eines" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Barra d'_estat" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Mostra o amaga la barra d'estat" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Quadre lateral" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Mostra o amaga el quadre lateral" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Tanca la connexió actual" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Tanca-ho tot" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Tanca totes les connexions actives" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Afegeix a les adreces d'interès" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Afegeix la connexió actual a les adreces d'interès" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Fes una captura de pantalla" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Fes una captura de pantalla de la connexió activa" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Envia Ctrl+Alt+Supr a la connexió activa" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Visualitza l'ordinador actual en mode de pantalla completa" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Mida original" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Ajusta la finestra a la mida de l'escriptori remot" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "Es_calat" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Ajusta la pantalla remota a la mida actual de la finestra" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "Només _lectura" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Inhabilita el ratolí i el teclat" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Barra d'eines" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Mostra o amaga la barra d'eines" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Barra d'_estat" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Mostra o amaga la barra d'estat" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_Quadre lateral" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Mostra o amaga el quadre lateral" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "S'ha produït un error:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "El Vinagre és un client de VNC per a l'escriptori GNOME" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "No s'ha pogut carregar el fitxer constructor: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "" +"El Vinagre és un visualitzador d'escriptoris remots per a l'escriptori GNOME" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -777,7 +986,7 @@ "Foundation; o bé la versió 2 de la llicència, o bé (si ho preferiu) " "qualsevol versió posterior." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -789,7 +998,7 @@ "PER A CAP PROPÒSIT PARTICULAR. Vegeu la Llicència Publica General de la GNU " "per a més detalls." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -798,32 +1007,61 @@ "juntament aquest programa. En cas contrari, vegeu ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "Joan Duran , 2007, 2008" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Lloc web del Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "No s'ha pogut fusionar el vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "Connexions _recents" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Obre %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Premeu Ctrl+Alt per a alliberar el cursor" +#~ msgid "Connection" +#~ msgstr "Connexió" + +#~ msgid "Folder" +#~ msgstr "Carpeta" + +#~ msgid "host or host:display or host::port" +#~ msgstr "ordinador o ordinador:pantalla o ordinador::port" + +#~ msgid "Supported formats" +#~ msgstr "Formats admesos" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Seleccioneu un servidor de VNC" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "No s'ha pogut trobar l'adreça de l'ordinador al fitxer." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Obre un fitxer .vnc" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- Client de VNC del GNOME" + +#~ msgid "Minimize window" +#~ msgstr "Minimitza la finestra" + +#~ msgid "_Read only" +#~ msgstr "Només _lectura" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Premeu Ctrl+Alt per a alliberar el cursor" #~ msgid "Editing a bookmark" #~ msgstr "Edició d'una adreça d'interès" @@ -863,9 +1101,6 @@ #~ "L'escalat no funciona correctament en finestres compostes. Inhabiliteu " #~ "els efectes visuals i torneu-ho a provar." -#~ msgid "_Port:" -#~ msgstr "_Port:" - #~ msgid "Image" #~ msgstr "Imatge" @@ -899,9 +1134,6 @@ #~ msgid "_Favorites" #~ msgstr "_Preferits" -#~ msgid "Configure the application" -#~ msgstr "Configureu l'aplicació" - #~ msgid "_Open favorite" #~ msgstr "_Obre el preferit" diff -Nru vinagre-2.26.1/po/ca@valencia.po vinagre-2.29.1/po/ca@valencia.po --- vinagre-2.26.1/po/ca@valencia.po 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/po/ca@valencia.po 2009-09-17 15:20:20.000000000 +0100 @@ -0,0 +1,1080 @@ +# translation of vinagre.gnome-2-26.po to catalan +# Traducció del Vinagre de l'equip de Softcatalà. +# Copyright © 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the Vinagre package. +# +# Joan Duran , 2007-2009. +# Carles Ferrando Garcia , 2009. +msgid "" +msgstr "" +"Project-Id-Version: vinagre.gnome-2-26\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-14 12:46+0200\n" +"PO-Revision-Date: 2009-09-06 15:57+0200\n" +"Last-Translator: Carles Ferrando Garcia \n" +"Language-Team: catalan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 +msgid "_About" +msgstr "_Quant a" + +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 +msgid "_Help" +msgstr "A_juda" + +#: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 +msgid "Access remote desktops" +msgstr "Accés a escriptoris remots" + +#: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 +msgid "Remote Desktop Viewer" +msgstr "Visualitzador d'escriptoris remots" + +#: ../data/vinagre.ui.h:1 +#, fuzzy +msgid "All fields above are mandatory" +msgstr "Tots els camps de sobre són obligatoris" + +#: ../data/vinagre.ui.h:2 +#, fuzzy +msgid "Authentication is required" +msgstr "Cal autenticació" + +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 +msgid "Bookmarks" +msgstr "Adreces d'interés" + +#: ../data/vinagre.ui.h:4 +#, fuzzy +msgid "Connection" +msgstr "S'està connectant..." + +#: ../data/vinagre.ui.h:5 +#, fuzzy +msgid "Connection options" +msgstr "Opcions de connexió" + +#: ../data/vinagre.ui.h:6 +#, fuzzy +msgid "Folder" +msgstr "Carpeta nova" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 +msgid "Host:" +msgstr "Ordinador:" + +#: ../data/vinagre.ui.h:8 +#, fuzzy +msgid "Interface" +msgstr "Interfície" + +#: ../data/vinagre.ui.h:9 +#, fuzzy +msgid "Options" +msgstr "Opcions" + +#: ../data/vinagre.ui.h:10 +#, fuzzy +msgid "Parent Folder" +msgstr "Carpeta pare" + +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "Preferències" + +#: ../data/vinagre.ui.h:12 +#, fuzzy +msgid "Which machine do you want to connect to?" +msgstr "A quin ordinador vos voleu connectar?" + +#: ../data/vinagre.ui.h:13 +msgid "_Always show tabs" +msgstr "_Mostra sempre les pestanyes" + +#. This is a button label, in the authentication dialog +#: ../data/vinagre.ui.h:15 +msgid "_Authenticate" +msgstr "_Autentica" + +#: ../data/vinagre.ui.h:16 +msgid "_Full screen" +msgstr "Pantalla _completa" + +#: ../data/vinagre.ui.h:17 +msgid "_Host:" +msgstr "_Ordinador:" + +#: ../data/vinagre.ui.h:18 +msgid "_Name:" +msgstr "_Nom:" + +#: ../data/vinagre.ui.h:19 +msgid "_Password:" +msgstr "_Contrasenya:" + +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "" + +#: ../data/vinagre.ui.h:21 +msgid "_Remember this credential" +msgstr "_Recorda esta credencial" + +#: ../data/vinagre.ui.h:22 +msgid "_Show menu shortcuts" +msgstr "_Mostra les dreceres del menú" + +#: ../data/vinagre.ui.h:23 +msgid "_Username:" +msgstr "_Nom d'usuari:" + +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:3 +msgid "Maximum number of history items in connect dialog" +msgstr "Nombre màxim d'elements de l'historial en el diàleg de connexió" + +#: ../data/vinagre.schemas.in.in.h:4 +msgid "" +"Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " +"Note that if they are enabled, those keys will be intercepted by the menu " +"and will not be sent to the remote host." +msgstr "" +"Establiu a «false» (fals) per a inhabilitar les dreceres del menú. Establiu a " +"«true» (cert) per a habilitar-les. Tingueu en compte que si estan " +"habilitades, estes tecles sempre seran interceptades pel menú i no " +"s'enviaran a l'ordinador remot." + +#: ../data/vinagre.schemas.in.in.h:5 +msgid "" +"Set to \"true\" to always show the tabs. Set to \"false\" to only show the " +"tabs when there is more than one active connection." +msgstr "" +"Establiu a «true» (cert) per a mostrar sempre les pestanyes. Establiu a " +"«false» (fals) per a mostrar les pestanyes només quan hi haja més d'una " +"connexió activa." + +#: ../data/vinagre.schemas.in.in.h:6 +msgid "Specifies the maximum number of items in the host dropdown entry." +msgstr "" +"Especifica el nombre màxim d'elements en l'entrada desplegable d'ordinadors." + +#: ../data/vinagre.schemas.in.in.h:7 +msgid "The handler for \"vnc://\" URLs" +msgstr "El gestor per a URL tipus «vnc://»" + +#: ../data/vinagre.schemas.in.in.h:8 +msgid "" +"When connecting to a host, the client can say to the server to leave other " +"clients connected or to drop the existent connections. Set the value to true " +"to share the desktop with the other clients." +msgstr "" +"Quan es connecta a un ordinador, el client pot dir al servidor que mantinga " +"els altres clients connectats o que abandone les altres connexions. Establiu " +"el valor a cert per a compartir l'escriptori amb altres clients." + +#: ../data/vinagre.schemas.in.in.h:9 +msgid "Whether we should leave other clients connected" +msgstr "Si s'haurien de mantindre els altres clients connectats" + +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Si s'haurien de mostrar les pestanyes encara que només hi haja una connexió " +"activa" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Si s'haurien de mostrar els acceleradors del menú (dreceres de teclat)" + +#: ../data/vinagre-mime.xml.in.h:1 +msgid "Remote Desktop (VNC) file" +msgstr "Fitxer d'escriptori remot (VNC)" + +#: ../data/vinagre-mime.xml.in.h:2 +msgid "Remote Desktop Connection" +msgstr "Connexió a un escriptori remot" + +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Valor incorrecte per a l'indicador «compartit»: %d. Hauria de ser 0 o 1. " +"S'ignorarà." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "No s'ha pogut analitzar el fitxer." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Només _visualitza" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "E_scalat" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nom de l'escriptori:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensions:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "S'ha produït un error en connectar-se a l'ordinador." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, fuzzy, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "" +"El mètode d'autenticació a l'ordinador %s no és compatible. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Autenticació no compatible" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Error d'autenticació" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Cal un nom d'usuari per a poder accedir a este ordinador." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Cal una contrasenya per a poder accedir a este ordinador." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "Es_calat" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +#, fuzzy +msgid "Fits the remote screen into the current window size" +msgstr "Ajusta la pantalla remota a la mida actual de la finestra" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +#, fuzzy +msgid "Does not send mouse and keyboard events" +msgstr "Inhabilita el ratolí i el teclat" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Mida original" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Ajusta la finestra a la mida de l'escriptori remot" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Envia Ctrl-Alt-Supr" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +#, fuzzy +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Envia Ctrl+Alt+Supr a la connexió activa" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Escalat" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Només lectura" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"L'escalat no funciona en esta instal·lació.\n" +"\n" +"Llegiu el fitxer README (distribuït amb el Vinagre) per a saber com " +"habilitar esta funció." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 +msgid "A menu to quickly access remote machines" +msgstr "Un menú per a accedir ràpidament a ordinadors remots" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 +msgid "Vinagre Applet Factory" +msgstr "Fàbrica de miniaplicacions del Vinagre" + +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 +msgid "Could not run vinagre:" +msgstr "No s'ha pogut executar el Vinagre:" + +#: ../vinagre/vinagre-applet.c:380 +msgid "Open Remote Desktop Viewer" +msgstr "Obri el visualitzador d'escriptoris remots" + +#: ../vinagre/vinagre-applet.c:435 +msgid "Access your bookmarks" +msgstr "Accedeix a les adreces d'interés" + +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "El protocol %s no és compatible." + +#: ../vinagre/vinagre-bookmarks.c:343 +#, c-format +msgid "Error while initializing bookmarks: %s" +msgstr "S'ha produït un error en inicialitzar les adreces d'interés: %s" + +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 +msgid "Unknown error" +msgstr "Error desconegut" + +#: ../vinagre/vinagre-bookmarks.c:350 +msgid "Error while initializing bookmarks: The file seems to be empty" +msgstr "" +"S'ha produït un error en inicialitzar les adreces d'interés: pareix ser que " +"el fitxer és buit" + +#: ../vinagre/vinagre-bookmarks.c:357 +msgid "" +"Error while initializing bookmarks: The file is not a vinagre bookmarks file" +msgstr "" +"S'ha produït un error en inicialitzar les adreces d'interés: el fitxer no és " +"un fitxer d'adreces d'interés del Vinagre" + +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 +msgid "Error while saving bookmarks: Failed to create the XML structure" +msgstr "" +"S'ha produït un error en alçar les adreces d'interés: no s'ha pogut crear " +"l'estructura XML" + +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 +msgid "Error while saving bookmarks: Failed to initialize the XML structure" +msgstr "" +"S'ha produït un error en alçar les adreces d'interés: no s'ha pogut " +"inicialitzar l'estructura XML" + +#: ../vinagre/vinagre-bookmarks.c:449 +msgid "Error while saving bookmarks: Failed to finalize the XML structure" +msgstr "" +"S'ha produït un error en alçar les adreces d'interés: no s'ha pogut " +"finalitzar l'estructura XML" + +#: ../vinagre/vinagre-bookmarks.c:458 +#, c-format +msgid "Error while saving bookmarks: %s" +msgstr "S'ha produït un error en alçar les adreces d'interés: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 +msgid "Error while migrating bookmarks: Failed to create the XML structure" +msgstr "" +"S'ha produït un error en migrar les adreces d'interés: no s'ha pogut crear " +"l'estructura XML" + +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 +msgid "Error while migrating bookmarks: Failed to initialize the XML structure" +msgstr "" +"S'ha produït un error en migrar les adreces d'interés: no s'ha pogut " +"inicialitzar l'estructura XML" + +#: ../vinagre/vinagre-bookmarks-migration.c:125 +msgid "Error while migrating bookmarks: Failed to finalize the XML structure" +msgstr "" +"S'ha produït un error en migrar les adreces d'interés: no s'ha pogut " +"finalitzar l'estructura XML" + +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 +#, c-format +msgid "Error while migrating bookmarks: %s" +msgstr "S'ha produït un error en migrar les adreces d'interés: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:164 +#, fuzzy +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "S'ha produït un error en migrar les adreces d'interés: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 +msgid "Failed to create the directory" +msgstr "No s'ha pogut crear el directori" + +#: ../vinagre/vinagre-bookmarks-migration.c:262 +msgid "" +"Migrating the bookmarks file to the new format. This operation is only " +"supposed to run once." +msgstr "" +"S'està migrant el fitxer d'adreces d'interés al format nou. Esta operació " +"només s'hauria d'executar una vegada." + +#: ../vinagre/vinagre-bookmarks-migration.c:270 +#, c-format +msgid "Error opening old bookmarks file: %s" +msgstr "" +"S'ha produït un error en obrir el fitxer d'adreces d'interés antigues: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 +msgid "Migration cancelled" +msgstr "S'ha cancel·lat la migració" + +#: ../vinagre/vinagre-bookmarks-migration.c:280 +msgid "Could not remove the old bookmarks file" +msgstr "No s'ha pogut suprimir el fitxer d'adreces d'interés antic" + +#: ../vinagre/vinagre-bookmarks-tree.c:120 +msgid "Root Folder" +msgstr "Carpeta arrel" + +#: ../vinagre/vinagre-bookmarks-ui.c:78 +msgid "Invalid name for this folder" +msgstr "El nom per a esta carpeta no és vàlid" + +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "Ja s'utilitza el nom «%s» en este directori. Utilitzeu-ne un altre." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "El nom per a este element no és vàlid" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, fuzzy, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Segur que voleu suprimir %s de les adreces d'interés?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 +msgid "Remove Folder?" +msgstr "Voleu suprimir la carpeta?" + +#: ../vinagre/vinagre-bookmarks-ui.c:315 +msgid "Notice that all its subfolders and items will be removed as well." +msgstr "" +"Tingueu en compte que també se suprimiran totes les subcarpetes i elements." + +#: ../vinagre/vinagre-bookmarks-ui.c:320 +msgid "Remove Item?" +msgstr "Voleu suprimir l'element?" + +#: ../vinagre/vinagre-bookmarks-ui.c:337 +msgid "Error removing bookmark: Entry not found" +msgstr "" +"S'ha produït un error en suprimir l'adreça d'interés: no s'ha trobat " +"l'entrada" + +#: ../vinagre/vinagre-bookmarks-ui.c:354 +msgid "New Folder" +msgstr "Carpeta nova" + +#: ../vinagre/vinagre-commands.c:120 +msgid "Choose the file" +msgstr "Seleccioneu el fitxer" + +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" + +#: ../vinagre/vinagre-commands.c:181 +msgid "The following file could not be opened:" +msgid_plural "The following files could not be opened:" +msgstr[0] "No s'ha pogut obrir el fitxer següent:" +msgstr[1] "No s'han pogut obrir els fitxers següents:" + +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "" + +#: ../vinagre/vinagre-connect.c:313 +#, c-format +msgid "Error while saving history file: %s" +msgstr "S'ha produït un error en alçar el fitxer de l'historial: %s" + +#: ../vinagre/vinagre-connect.c:340 +#, fuzzy +msgid "Choose a Remote Desktop" +msgstr "Obri el visualitzador d'escriptoris remots" + +#: ../vinagre/vinagre-connection.c:627 +msgid "Could not open the file." +msgstr "No s'ha pogut obrir el fitxer." + +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "" + +#: ../vinagre/vinagre-fav.c:670 +msgid "Invalid operation" +msgstr "Operació no vàlida" + +#: ../vinagre/vinagre-fav.c:671 +msgid "Data received from drag&drop operation is invalid." +msgstr "" +"Les dades rebudes de l'operació d'arrossegar i deixar anar no són vàlides." + +#: ../vinagre/vinagre-fav.c:871 +msgid "Hosts nearby" +msgstr "Ordinadors propers" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 +msgid "Create a new toplevel window in an existing instance of vinagre" +msgstr "" +"Crea una finestra de nivell superior nova en una instància actual del Vinagre" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "nomdelfitxer" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 +msgid "[server:port]" +msgstr "[servidor:port]" + +#: ../vinagre/vinagre-main.c:130 +msgid "The following error has occurred:" +msgid_plural "The following errors have occurred:" +msgstr[0] "S'ha produït l'error següent:" +msgstr[1] "S'han produït els errors següents:" + +#. Setup command line options +#: ../vinagre/vinagre-main.c:169 +#, fuzzy +msgid "- Remote Desktop Viewer" +msgstr "Visualitzador d'escriptoris remots" + +#: ../vinagre/vinagre-main.c:193 +msgid "" +"Run 'vinagre --help' to see a full list of available command line options" +msgstr "" +"Executeu «vinagre --help» per a veure una llista completa de les opcions " +"disponibles en la línia d'ordes" + +#: ../vinagre/vinagre-mdns.c:144 +#, c-format +msgid "Failed to resolve avahi hostname: %s\n" +msgstr "No s'ha pogut resoldre el nom Avahi de l'ordinador: %s\n" + +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "" + +#: ../vinagre/vinagre-mdns.c:211 +#, fuzzy, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "No s'han pogut explorar els ordinadors: %s\n" + +#: ../vinagre/vinagre-mdns.c:227 +#, c-format +msgid "Failed to browse for hosts: %s\n" +msgstr "No s'han pogut explorar els ordinadors: %s\n" + +#: ../vinagre/vinagre-mdns.c:300 +#, fuzzy, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "No s'han pogut explorar els ordinadors: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, fuzzy, c-format +msgid "Connection to host %s was closed." +msgstr "S'ha tancat la connexió amb l'ordinador %s." + +#: ../vinagre/vinagre-notebook.c:463 +msgid "Connection closed" +msgstr "S'ha tancat la connexió" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, fuzzy, c-format +msgid "Authentication to host %s has failed" +msgstr "Ha fallat l'autenticació a l'ordinador %s" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Ha fallat l'autenticació" + +#: ../vinagre/vinagre-notebook.c:525 +msgid "Connecting..." +msgstr "S'està connectant..." + +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 +msgid "Close connection" +msgstr "Tanca la connexió" + +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:824 +#, fuzzy +msgid "_About Plugin" +msgstr "_Quant a" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "" + +#: ../vinagre/vinagre-prefs.c:227 +msgid "Cannot initialize preferences manager." +msgstr "No es pot inicialitzar el gestor de preferències." + +#: ../vinagre/vinagre-tab.c:346 +#, fuzzy +msgid "Leave fullscreen" +msgstr "Pantalla _completa" + +#: ../vinagre/vinagre-tab.c:495 +msgid "Error saving recent connection." +msgstr "S'ha produït un error en alçar la connexió recent." + +#: ../vinagre/vinagre-tab.c:728 +#, fuzzy +msgid "Error saving the credentials on the keyring." +msgstr "S'ha produït un error en alçar la credencial a l'anell de claus." + +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "No s'ha pogut obtindre una captura de pantalla de la connexió." + +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Alça la captura de pantalla" + +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Captura de pantalla de %s" + +#: ../vinagre/vinagre-tab.c:881 +#, fuzzy +msgid "Error saving screenshot" +msgstr "S'ha produït un error en alçar la connexió recent." + +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:286 +#, fuzzy, c-format +msgid "Impossible to create the connection: %s" +msgstr "No s'ha pogut crear el directori" + +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "" + +#. Toplevel +#: ../vinagre/vinagre-ui.h:33 +msgid "_Machine" +msgstr "_Ordinador" + +#: ../vinagre/vinagre-ui.h:34 +msgid "_Edit" +msgstr "_Edita" + +#: ../vinagre/vinagre-ui.h:35 +msgid "_View" +msgstr "_Visualitza" + +#: ../vinagre/vinagre-ui.h:36 +msgid "_Bookmarks" +msgstr "_Adreces d'interés" + +#: ../vinagre/vinagre-ui.h:41 +msgid "Connect to a remote machine" +msgstr "Connectar-se a un ordinador remot" + +#: ../vinagre/vinagre-ui.h:43 +msgid "Open a .VNC file" +msgstr "Obri un fitxer .VNC" + +#: ../vinagre/vinagre-ui.h:45 +msgid "Quit the program" +msgstr "Ix del programa" + +#: ../vinagre/vinagre-ui.h:49 +msgid "Edit the application preferences" +msgstr "Edita les preferències de l'aplicació" + +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. +#. Bookmarks menu +#: ../vinagre/vinagre-ui.h:56 +msgid "_Open bookmark" +msgstr "_Obri una adreça d'interés" + +#: ../vinagre/vinagre-ui.h:57 +msgid "Connect to this machine" +msgstr "Connecta't a este ordinador" + +#: ../vinagre/vinagre-ui.h:58 +msgid "_Edit bookmark" +msgstr "_Edita una adreça d'interés" + +#: ../vinagre/vinagre-ui.h:59 +msgid "Edit the details of selected bookmark" +msgstr "Edita els detalls de l'adreça d'interés seleccionada" + +#: ../vinagre/vinagre-ui.h:60 +msgid "_Remove from bookmarks" +msgstr "_Suprimeix de les adreces d'interés" + +#: ../vinagre/vinagre-ui.h:61 +msgid "Remove current selected connection from bookmarks" +msgstr "Suprimeix la connexió seleccionada de les adreces d'interés" + +#: ../vinagre/vinagre-ui.h:62 +msgid "_New Folder" +msgstr "_Carpeta nova" + +#: ../vinagre/vinagre-ui.h:63 +msgid "Create a new folder" +msgstr "Crea una carpeta nova" + +#. Help menu +#: ../vinagre/vinagre-ui.h:66 +msgid "_Contents" +msgstr "_Continguts" + +#: ../vinagre/vinagre-ui.h:67 +msgid "Open the vinagre manual" +msgstr "Obri el manual del Vinagre" + +#: ../vinagre/vinagre-ui.h:69 +msgid "About this application" +msgstr "Quant a l'aplicació" + +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Barra d'eines" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Mostra o amaga la barra d'eines" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Barra d'_estat" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Mostra o amaga la barra d'estat" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Quadre lateral" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Mostra o amaga el quadre lateral" + +#: ../vinagre/vinagre-ui.h:91 +msgid "Close the current connection" +msgstr "Tanca la connexió actual" + +#: ../vinagre/vinagre-ui.h:92 +msgid "C_lose All" +msgstr "_Tanca-ho tot" + +#: ../vinagre/vinagre-ui.h:93 +msgid "Close all active connections" +msgstr "Tanca totes les connexions actives" + +#. Bookmarks menu +#: ../vinagre/vinagre-ui.h:96 +msgid "_Add to bookmarks" +msgstr "_Afig a les adreces d'interés" + +#: ../vinagre/vinagre-ui.h:97 +msgid "Add current connection to your bookmarks" +msgstr "Afig la connexió actual a les adreces d'interés" + +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Fes una captura de pantalla" + +#: ../vinagre/vinagre-ui.h:105 +msgid "Take a screenshot of active connection" +msgstr "Fes una captura de pantalla de la connexió activa" + +#: ../vinagre/vinagre-ui.h:109 +msgid "View the current machine in full screen" +msgstr "Visualitza l'ordinador actual en mode de pantalla completa" + +#: ../vinagre/vinagre-utils.c:75 +msgid "An error has occurred:" +msgstr "S'ha produït un error:" + +#: ../vinagre/vinagre-utils.c:150 +#, fuzzy, c-format +msgid "Could not load builder file: %s" +msgstr "No s'ha pogut obrir el fitxer." + +#: ../vinagre/vinagre-utils.c:453 +#, fuzzy +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "El Vinagre és un client de VNC per a l'escriptori GNOME" + +#: ../vinagre/vinagre-utils.c:456 +msgid "" +"Vinagre 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 "" +"El Vinagre és programari lliure; el podeu redistribuir i/o modificar sota " +"els termes de la Llicència Publica General GNU publicat per la Free Software " +"Foundation; o bé la versió 2 de la llicència, o bé (si ho preferiu) " +"qualsevol versió posterior." + +#: ../vinagre/vinagre-utils.c:460 +msgid "" +"Vinagre 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 "" +"El Vinagre es distribueix amb l'esperança que siga útil, però SENSE CAP " +"GARANTIA; ni tan sols la garantia implícita de COMERCIALITZACIÓ o ADEQUACIÓ " +"PER A CAP PROPÒSIT PARTICULAR. Vegeu la Llicència Publica General de la GNU " +"per a més detalls." + +#: ../vinagre/vinagre-utils.c:464 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"this program. If not, see ." +msgstr "" +"Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU " +"juntament este programa. En cas contrari, vegeu ." + +#: ../vinagre/vinagre-utils.c:486 +msgid "translator-credits" +msgstr "Joan Duran , 2007, 2008" + +#: ../vinagre/vinagre-utils.c:489 +msgid "Vinagre Website" +msgstr "Lloc web del Vinagre" + +#: ../vinagre/vinagre-window.c:397 +#, c-format +msgid "Could not merge vinagre-ui.xml: %s" +msgstr "No s'ha pogut fusionar el vinagre-ui.xml: %s" + +#: ../vinagre/vinagre-window.c:425 +msgid "_Recent connections" +msgstr "Connexions _recents" + +#. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu +#: ../vinagre/vinagre-window.c:585 +#, c-format +msgid "Open %s:%d" +msgstr "Obri %s:%d" + +#~ msgid "Connection" +#~ msgstr "Connexió" + +#~ msgid "Folder" +#~ msgstr "Carpeta" + +#~ msgid "host or host:display or host::port" +#~ msgstr "ordinador o ordinador:pantalla o ordinador::port" + +#~ msgid "Supported formats" +#~ msgstr "Formats admesos" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Seleccioneu un servidor de VNC" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "No s'ha pogut trobar l'adreça de l'ordinador al fitxer." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Obri un fitxer .vnc" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- Client de VNC del GNOME" + +#~ msgid "Minimize window" +#~ msgstr "Minimitza la finestra" + +#~ msgid "_Read only" +#~ msgstr "Només _lectura" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Premeu Ctrl+Alt per a alliberar el cursor" diff -Nru vinagre-2.26.1/po/ChangeLog vinagre-2.29.1/po/ChangeLog --- vinagre-2.26.1/po/ChangeLog 2009-04-13 14:28:57.000000000 +0100 +++ vinagre-2.29.1/po/ChangeLog 2009-04-18 14:25:15.000000000 +0100 @@ -1,3 +1,5 @@ +==================== 2.26.1 ======================= + 2009-04-12 Baris Cicek * tr.po: Updated Turkish translation. diff -Nru vinagre-2.26.1/po/cs.po vinagre-2.29.1/po/cs.po --- vinagre-2.26.1/po/cs.po 2009-04-13 14:28:57.000000000 +0100 +++ vinagre-2.29.1/po/cs.po 2009-10-19 12:18:45.000000000 +0100 @@ -3,26 +3,24 @@ # This file is distributed under the same license as the vinagre package. # Lucas Lommer , 2007, 2008, 2009. # Petr Kovar , 2008, 2009. -# msgid "" msgstr "" "Project-Id-Version: vinagre\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-04 19:41+0200\n" -"PO-Revision-Date: 2009-04-01 00:23+0100\n" -"Last-Translator: Lucas Lommer \n" +"POT-Creation-Date: 2009-10-10 19:15+0200\n" +"PO-Revision-Date: 2009-10-10 19:15+0200\n" +"Last-Translator: Petr Kovar \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "O _aplikaci" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Nápověda" @@ -31,124 +29,120 @@ msgstr "Přístup na vzdálené plochy" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Prohlížeč vzdálené plochy" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Je vyžadováno ověření" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Možnosti připojeni" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Připojeni" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Složka" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Rozhraní" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Možnosti" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Rodičovská složka" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "K jakému stroji se chcete připojit?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Všechna pole výše jsou povinná" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Všechna pole výše jsou povinná" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Je vyžadováno ověření" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Záložky" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Spojení" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Možnosti spojení" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Složka" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Hostitel:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Rozhraní" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Možnosti" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Rodičovská složka" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Nastavení" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "Jestli zobrazovat karty i když je aktivní jen jedno spojení" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "K jakému stroji se chcete připojit?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Jestli zobrazovat akcelerátory klávesových zkratek" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "Vždy zobr_azovat karty" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Ověřit" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Celá obrazovka" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Hostitel:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Název:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Heslo:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokol:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Zapamatovat si přihlašovací údaje" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "Š_kálování" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "Zobrazovat kláve_sové zkratky nabídky" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Uživatelské jméno:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Jen pozoro_vání" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Aktivní zásuvné moduly" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "hostitel nebo hostitel:displej nebo hostitel::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Seznam aktivních zásuvných modulů. Položky obsahují \"Umístění\" modulu. " +"Údaj o \"Umístění\" každého modulu je v souboru .vinagre-plugin." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Nejvyšší počet položek historie v okně připojení" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -159,7 +153,7 @@ "klávesové zkratky aktivovány, budou zpracovávány pro menu a nebudou " "odesílány vzdálenému hostiteli." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -168,15 +162,15 @@ "nastavíte na nepravda (false), karty budou zobrazeny, pokud existuje více " "než jedno aktivní spojení." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Určuje nejvyšší počet položek ve výběru hostitele." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Obsluha pro adresy \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -186,10 +180,19 @@ "existující připojení ostatních klientů, nebo že mají být odpojeni. Nastavte " "hodnotu na pravda (true), pokud chcete plochu sdílet s ostatními klienty." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Jestli má nechat ostatní klienty připojené" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Jestli zobrazovat karty i když je aktivní jen jedno spojení" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Jestli zobrazovat akcelerátory klávesových zkratek" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Vzdálená plocha (VNC)" @@ -198,90 +201,269 @@ msgid "Remote Desktop Connection" msgstr "Připojení ke vzdálené ploše" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Přístup k unixovému/linuxovému terminálu" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Podpora SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Chybná hodnota pro přepínač 'shared': %d. Má být 0 nebo 1. Ignoruje se." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Povolit režim změny rozměrů" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Možnosti VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Zobrazí možnosti VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Přístup k Unixu/Linuxu, Windows a dalším strojům." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Soubor nelze analyzovat." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Tento soubor nepatří k VNC: chybí skupina \"spojení\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Tento soubor nepatří k VNC: chybí klíč \"host\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Možnosti VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Jen pozoro_vání" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "Š_kálování" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Soubory VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Název plochy:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Rozměry:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Chyba v připojování k hostiteli." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Metoda ověření přístupu k hostiteli %s není podporována. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Ověření přístupu není podporováno" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Chyba ověření" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "K přístupu k tomuto počítači je vyžadováno uživatelské jméno." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "K přístupu k tomuto počítači je vyžadováno heslo." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "Š_kálování" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Přizpůsobit obrazovku vzdálené plochy rozměrům okna" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Neodesílá události klávesnice a myši" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Pův_odní velikost" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Přizpůsobit okno rozměrům vzdálené plochy" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Poslat Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Odešle Ctrl+Alt+Del vzdálenému stroji" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Škálování" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Jen pro čtení" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Současná instalace škálování nepodporuje.\n" +"\n" +"Přečtěte si soubor README (obdrželi jste jej s Vinagre), kde je popsáno, jak " +"tuto schopnost povolit." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Podpora VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Nabídka pro rychlý přístup ke vzdáleným strojům" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Generátor appletu Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Nelze spustit vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Otevřít prohlížeč vzdálené plochy" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Přístup k záložkám" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokol %s není podporován." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Chyba při nahrávání záložek: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Neznámá chyba" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Chyba při nahrávání záložek: Soubor se zdá být prázdný" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "Chyba při nahrávání záložek: Tento soubor neobsahuje záložky vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Chyba při ukládání záložek: Chyba při vytváření struktury XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Chyba při ukládání záložek: Chyba při nahrávání struktury XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Chyba při ukládání záložek: Chyba při dokončování struktury XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Chyba při ukládání záložek: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Chyba při migraci záložek: Chyba při vytváření struktury XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Chyba při migraci záložek: Chyba při nahrávání struktury XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Chyba při migraci záložek: Chyba při dokončování struktury XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Chyba při migraci záložek: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Chyba při migraci záložek: Zásuvný modul pro VNC není aktivován" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Chyba při vytváření adresáře" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -289,141 +471,153 @@ "Migrace souboru se záložkami na nový formát. Od této operace se očekává, že " "poběží pouze jednou." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Chyba při otevírání starého souboru se záložkami: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migrace zrušena" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Nelze odstranit starý soubor se záložkami" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Kořenová složka" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Neplatný název složky" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." msgstr "Název \"%s\" se již v této složce používá. Zvolte prosím název jiný." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Neplatný název položky" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokol: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Jste si jisti, že chcete odstranit %s ze záložek?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Jste si jisti, že chcete odstranit položku %s ze záložek?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Odstranit složku?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Mějte na paměti, že budou také odstraněny všechny podsložky a obsah." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Odstranit položku?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Chyba při odstraňování záložky: Položka nebyla nalezena" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Nová složka" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Vyberte soubor" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Podporované formáty" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Žádné podporované soubory" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Žádný z aktivních zásuvných modulů nenabízí možnost otevření souboru. " +"Aktivujte nějaké zásuvné moduly a zkuste to znovu." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Následující soubor se nepodařilo otevřít:" msgstr[1] "Následující soubory se nepodařilo otevřít:" msgstr[2] "Následující soubory se nepodařilo otevřít:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Nelze získat aktivní protokol ze seznamu protokolů." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Chyba při ukládání souboru s historií: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Zvolte server VNC" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokol %s není podporován." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Vyberte vzdálenou pracovní plochu" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Soubor nelze otevřít." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Soubor nelze parsovat." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Chybná hodnota pro přepínač 'shared': %d. Ma být 0 nebo 1. Ignoruje se." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Soubor nebyl rozpoznán žádným zásuvným modulem." -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Adresa hostitele nebyla v souboru nalezena." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Neplatná operace" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Data předaná pomocí přetažení nejsou platná." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Okolní hostitelé" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Otevře soubor .vnc" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "soubor" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Spustit vinagre v režimu celé obrazovky" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Vytvořit nové hlavní okno v již existující instanci Vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Otevřít soubor použitelný s vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "soubor" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Došlo k následující chybě:" @@ -431,317 +625,329 @@ msgstr[2] "Došlo k následujícím chybám:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "– klient VNC pro GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Prohlížeč vzdálené plochy" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Spusťte \"vinagre --help\" pro zobrazení seznamu všech parametrů příkazového " "řádku" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Nepodařilo se zjistit jméno hostitele avahi: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Zásuvný modul %s je již registrován jako prohlížeč služby %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Nelze přidat prohlížeč mDNS pro službu %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Chyba při procházení hostitelů: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 #, c-format -msgid "Connection to host %s was closed." -msgstr "Spojení s hostitelem %s bylo ukončeno." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Nelze spustit prohlížeč mDNS pro službu %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "Spojení s hostitelem %s bylo ukončeno." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Spojení bylo ukončeno" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Ověření přístupu k hostiteli %s selhalo" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Ověření přístupu selhalo" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." -msgstr "Připojuji..." +msgstr "Připojuje se..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Ukončit spojení" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Správce zásuvných modulů" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Zásuvný modul" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Povolen" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Nastavit" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ktivovat" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ak_tivovat vše" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Deaktivovat vše" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_O modulu" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "_Nastavit modul" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Nelze spustit správce nastavení." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Chyba v připojování k hostiteli." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Ověření přístupu k hostiteli %s selhalo" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Ověření přístupu selhalo" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Opustit režim celé obrazovky" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Metoda ověření přístupu k hostiteli %s není podporována. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Ověření přístupu není podporováno" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Chyba při ukládání aktuálního spojení." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Chyba při ukládání přihlašovacích údajů do klíčenky." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Chyba ověření" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "K přístupu k tomuto počítači je vyžadováno uživatelské jméno." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "K přístupu k tomuto počítači je vyžadováno heslo." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimalizovat okno" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Škálování" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Nelze sejmout snímek obrazovky tohoto spojení." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Jen pro čtení" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Uložit snímek obrazovky" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Sejmout obrazovku" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Snímek obrazovky %s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Poslat Ctrl-Alt-Del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Chyba při ukládání snímku obrazovky" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Název plochy:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Nelze zjistit vlastnosti služby: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Nelze vytvořit spojení: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Rozměry:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Nelze přijmout stream tube: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Nelze sejmout snímek obrazovky tohoto spojení." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Nelze získat kontaktní název: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "Snímek obrazovky %s" +msgid "Impossible to get the avatar: %s" +msgstr "Nelze získat avatar: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Uložit snímek obrazovky" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s s vámi chce sdílet svoji pracovní plochu." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Současná instalace škálování nepodporuje.\n" -"\n" -"Přečtěte si soubor README (obdrželi jste jej s Vinagre), kde je popsáno, jak " -"tuto schopnost povolit." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Pozvat ke sdílení pracovní plochy" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Stroj" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Upravit" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Zobrazit" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "Zá_ložky" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Připojit se ke vzdálenému stroji" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Otevřít soubor .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Ukončit program" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Úprava nastavení aplikace" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Otevřít záložku" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Připojit se k tomuto stroji" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "Up_ravit záložku" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Upravit podrobnosti vybrané záložky" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Odstranit ze záložek" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Odstranit právě zvolené spojení ze záložek" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Nová složka" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Vytvořit novou složku" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Obsah" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Otevřít manuál k Vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "O této aplikaci" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Nástrojová liš_ta" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Zobrazit nebo skrýt nástrojovou lištu" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Stavová lišta" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Zobrazit nebo skrýt stavovou lištu" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Boční _panel" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Zobrazit nebo skrýt boční panel" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Ukončit aktuální spojení" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Ukončit vše" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Ukončit veškerá aktivní spojení" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "Přid_at do záložek" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Přidat aktuální spojení do záložek" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Sejmout obrazovku" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Sejmout obrazovku aktuálního spojení" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Odeslat Ctrl+Alt+Del aktivnímu spojení" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Zobrazit aktuální spojení na celou obrazovku" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Pův_odní velikost" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Přizpůsobit okno rozměrům vzdálené plochy" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "Š_kálování" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Přizpůsobit obrazovku vzdálené plochy rozměrům okna" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "Jen p_ro čtení" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Zakázat klávesnici a myš" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Nástrojová liš_ta" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Zobrazit nebo skrýt nástrojovou lištu" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Stavová lišta" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Zobrazit nebo skrýt stavovou lištu" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Boční _panel" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Zobrazit nebo skrýt boční panel" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Došlo k chybě:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre je klient VNC pro prostředí GNOME" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Nelze načíst soubor pro sestavení: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "" +"Vinagre je nástroj prohlížení vzdálené plochy určený pro prostředí GNOME" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -753,7 +959,7 @@ "to buď verze 2 této licence anebo (podle vlastního uvážení) kterékoliv " "pozdější verze." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -765,7 +971,7 @@ "VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti hledejte v GNU General Public " "License." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -773,31 +979,27 @@ "Kopii GNU General Public License jste měl(a) obdržet spolu s tímto " "programem; pokud se tak nestalo, navštivte ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Lucas Lommer \n" "Petr Kovář " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Domácí stránka Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Nelze napojit vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Nedávná spojení" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Otevřít %s:%d" - -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Stiskněte Ctrl+Alt k uvolnění kurzoru" diff -Nru vinagre-2.26.1/po/da.po vinagre-2.29.1/po/da.po --- vinagre-2.26.1/po/da.po 2009-04-13 14:28:57.000000000 +0100 +++ vinagre-2.29.1/po/da.po 2009-09-17 15:20:20.000000000 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: vinagre\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-09 12:44+0200\n" -"PO-Revision-Date: 2009-04-09 12:46+0200\n" +"POT-Creation-Date: 2009-09-13 03:50+0200\n" +"PO-Revision-Date: 2009-09-12 17:30+0200\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -17,11 +17,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Om" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Hjælp" @@ -30,124 +30,121 @@ msgstr "Tilgå fjernskriveborde" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Fjernskrivebordsviser" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Godkendelse påkræves" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Forbindelsesindstillinger" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Forbindelse" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Mappe" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Grænseflade" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Indstillinger" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Ophavsmappe" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Hvilken maskine vil du forbinde til?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Alle ovenstående felter er påkrævede" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Alle ovenstående felter er påkrævet" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Godkendelse påkræves" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Bogmærker" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Forbindelse" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Forbindelsesindstillinger" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Mappe" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Vært:" -#: ../data/vinagre.glade.h:12 -msgid "Preferences" +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Grænseflade" + +#: ../data/vinagre.ui.h:9 +msgid "Options" msgstr "Indstillinger" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "Om vi skal vise faneblade selv når der kun er én aktiv forbindelse" +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Ophavsmappe" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Om vi skal vise menugenvejene (genvejstaster)" +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "Indstillinger" + +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Hvilken maskine vil du forbinde til?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Vis altid faneblade" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Godkend" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Fuldskærm" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Vært:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Navn:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Kodeord:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokol:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Husk dette akkreditiv" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Skalering" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Vis menugenveje" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Brugernavn:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Vis kun" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Aktive udvidelsesmoduler" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "vært eller vært:display eller vært::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Liste af aktive udvidelsesmoduler. Den indeholder \"Location\" for de aktive " +"moduler. Se filen .vinagre-plugin for hvordan man får fat i \"Location\" for " +"et givent modul." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Maksimalt antal historikelementer i forbindelsesdialog" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -157,7 +154,7 @@ "aktivere dem. Bemærk at hvis de aktiveres, vil disse taster indfanges af " "menuen og vil ikke blive afsendt til den fjerne vært." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -165,15 +162,15 @@ "Sæt til \"true\" for altid at vise fanebladende. Sæt til \"false\" for kun " "at vise fanebladende, når der er mere end én aktiv forbindelse." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Angiver det maksimale antal elementer i værtsrullegardin-feltet." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Håndteringsinstans for \"vnc://\"-URL'er" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -184,10 +181,19 @@ "eksisterende forbindelser. Sæt værdien til \"true\" for at dele skrivebord " "med andre klienter." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Om vi skal lade andre klienter forblive tilsluttet" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Om vi skal vise faneblade selv når der kun er én aktiv forbindelse" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Om vi skal vise menugenvejene (genvejstaster)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Fjernskrivebordsfil (VNC)" @@ -196,93 +202,275 @@ msgid "Remote Desktop Connection" msgstr "Fjernskrivebordsforbindelse" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Tilgå Unix/Linux-terminaler" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH-understøttelse" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Ugyldig værdi for \"shared\"-flaget: %d. Den bør være 0 eller 1. Ignorerer " +"den." + +# Kommentaren hjælper mig ikke så meget, da det ville kræve installation af udviklingsversionen +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Aktivér skaleret tilstand" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC-indstillinger:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Vis VNC-indstillinger" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Tilgå Unix-/Linux-, Windows- og andre maskiner." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Kunne ikke fortolke filen." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Filen er ikke en VNC-fil: Mangler gruppen \"connection\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Filen er ikke en VNC-fil: Mangler nøglen \"host\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC-indstillinger" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Vis kun" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Skalering" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC-filer" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Skrivebordsnavn:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensioner:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Fejl under forbindelse til vært." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Godkendelsesmetoden for værten %s understøttes ikke. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Godkendelse understøttes ikke" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Godkendelsesfejl" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Adgang til denne maskine kræver et brugernavn." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Adgang til denne maskine kræver en adgangskode." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "S_kalering" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Tilpasser den fjerne skærm til den aktuelle vinduesstørrelse" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Sender ikke muse- og tastaturbegivenheder" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Original størrelse" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Justerer vinduet til størrelsen af fjernskrivebordet" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Send Ctrl+Alt+Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Sender Ctrl+Alt+Del til fjernmaskinen" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Skalerer" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Skrivebeskyttet" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Skalering understøttes ikke på denne installation.\n" +"\n" +"Læs README-filen (som distribueres med Vinagre) for at finde ud af hvordan " +"denne funktionalitet aktiveres." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC-understøttelse" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "En menu til hurtigt at tilgå fjerne computere" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre-Appletfabrik" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Kunne ikke køre vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Åbn fjernskrivebordsviser" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Tilgå dine bogmærker" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokollen %s understøttes ikke." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Fejl under initiering af bogmærker: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Ukendt fejl" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Fejl under initiering af bogmærker: Filen synes at være tom" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Fejl under initiering af bogmærker: Filen er ikke en vinagre-bogmærkefil" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Fejl ved gemning af bogmærker: Kunne ikke oprette XML-strukturen" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Fejl ved gemning af bogmærker: Kunne ikke initiere XML-strukturen" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Fejl ved gemning af bogmærker: Kunne ikke færdigbehandle XML-strukturen" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Fejl ved gemning af bogmærker: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Fejl ved overflytning af bogmærker: Kunne ikke oprette XML-strukturen" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Fejl ved overflytning af bogmærker: Kunne ikke initiere XML-strukturen" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Fejl ved overflytning af bogmærker: Kunne ikke færdigbehandle XML-strukturen" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Fejl ved overflytning af bogmærker: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" +"Fejl ved overflytning af bogmærker: VNC-udvidelsesmodulet er ikke aktiveret" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Kunne ikke oprette mappen" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -290,458 +478,483 @@ "Overflytter bogmærkefilen til det nye format. Denne operation bør kun køre " "én gang." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Fejl under åbning af gammel bogmærkefil: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Overflytning annulleret" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Kunne ikke fjerne den gamle bogmærkefil" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Rodmappe" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Ugyldigt navn for denne mappe" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." -msgstr "Navnet \"%s\" er allerede brugt i denne mappe. Brug venligst et andet navn." +msgstr "" +"Navnet \"%s\" er allerede brugt i denne mappe. Brug venligst et andet navn." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Ugyldigt navn for dette objekt" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokol: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Er du sikker på at du vil fjerne %s fra bogmærker?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Er du sikker på at du vil fjerne %s fra bogmærker?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Fjern mappe?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "" "Bemærk at alle dens undermapper og elementer ligeledes vil blive fjernet." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Fjern element?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Fejl ved fjernelse af bogmærke: Post blev ikke fundet" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Ny mappe" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Vælg filen" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Understøttede formater" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Der er ingen understøttede filer" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Ingen af de aktive udvidelsesmoduler giver mulighed for at åbne en " +"understøttet fil. Aktivér nogle udvidelsesmoduler og prøv igen." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Den følgende fil kunne ikke åbnes:" msgstr[1] "De følgende filer kunne ikke åbnes:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Kunne ikke se den aktive protokol i protokollisten." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Fejl under gemning af historikfil: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Vælg en VNC-server" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Vælg et fjernskrivebord" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokollen %s understøttes ikke." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Kunne ikke åbne filen." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Kunne ikke fortolke filen." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Filen blev ikke genkendt af noget udvidelsesmodul." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Ugyldig værdi for \"shared\"-flaget: %d. Den bør være 0 eller 1. Ignorerer " -"den." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Kunne ikke finde værtsadressen i filen." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Ugyldig operation" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Dataene modtaget fra træk&slip-operationen er ugyldige." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Nærliggende værter" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Åbner en .vnc-fil" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Åbn vinagre i fuldskærmstilstand" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "filnavn" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Opret et nyt topniveau-vindue i en eksisterende instans af vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Åbn en fil, der genkendes af vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "filnavn" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Den følgende fejl er opstået:" msgstr[1] "Følgende fejl er opstået:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- VNC-klient til GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Fjernskrivebordsviser" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Kør \"vinagre --help\" for at se en fuldstændig liste af kommandolinjetilvalg" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Kunne ikke fortolke avahi-værtsnavn: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "" +"Udvidelsesmodulet %s har allerede registreret en browser til tjenesten %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Kunne ikke tilføje mDNS-browser til tjenesten %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Kunne ikke gennemsøge efter værter: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Kunne ikke initialisere mDNS-læser: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Forbindelsen til værten %s blev lukket." +msgid "Connection to host %s was closed." +msgstr "Forbindelsen til værten %s blev lukket." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Forbindelsen lukket" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Godkendelse for værten %s mislykkedes" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Godkendelse mislykkedes" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Forbinder..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Afbryd forbindelse" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Modulhåndtering" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Udvidelsesmodul" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Aktiveret" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Konfigurér" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ktivér" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Aktivér _alle" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Deaktivér alle" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Om udvidelsesmodulet" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "Ko_nfigurér udvidelsesmodulet" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Kan ikke initiere indstillingshåndtering." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Fejl under forbindelse til vært." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Godkendelse for værten %s mislykkedes" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Godkendelse mislykkedes" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Godkendelsesmetoden for værten %s understøttes ikke. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Godkendelse understøttes ikke" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Forlad fuldskærm" -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Fejl under gemning af seneste forbindelse." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Fejl under gemning af akkreditiv til nøgleringen." - -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Godkendelsesfejl" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Adgang til denne maskine kræver et brugernavn." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Adgang til denne maskine kræver en adgangskode." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Fejl under gemning af akkreditiver til nøgleringen." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimér vindue" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Kunne ikke tage et skærmbillede af forbindelsen." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Skalerer" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Gem skærmbillede" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Skrivebeskyttet" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Skærmbillede af %s" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Tag skærmbillede" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Fejl under gemning af skærmbillede" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Send Ctrl+Alt+Del" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Umuligt at hente tjenesteegenskab: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Skrivebordsnavn:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Umuligt at oprette forbindelsen: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +# WTF +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Umuligt at acceptere stream-tube: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensioner:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Umuligt at hente kontaktnavn: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Kunne ikke tage et skærmbillede af forbindelsen." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Umuligt at hente profilbillede: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "Skærmbillede af %s" +msgid "%s wants to share his desktop with you." +msgstr "%s vil godt dele sit skrivebord med dig." -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Gem skærmbillede" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Skalering understøttes ikke på denne installation.\n" -"\n" -"Læs README-filen (som distribueres med Vinagre) for at finde ud af hvordan " -"denne funktionalitet aktiveres." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Invitation til deling af skrivebord" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Maskine" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Redigér" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Vis" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Bogmærker" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Forbind til en fjern maskine" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Åbn en .VNC-fil" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Afslut programmet" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Redigér programindstillingerne" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Åbn bogmærke" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Forbind til denne maskine" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Redigér bogmærke" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Redigér detaljerne for det markerede bogmærke" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Fjern fra bogmærker" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Fjern den markerede forbindelse fra bogmærker" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Ny mappe" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Opret en ny mappe" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Indhold" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Åbn vinagre-manualen" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Om dette program" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Værktøjslinje" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Vis eller skjul værktøjslinjen" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Statusbjælke" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Vis eller skjul statusbjælken" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Side_panel" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Vis eller skjul sidepanelet" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Luk den nuværende forbindelse" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "L_uk alle" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Luk alle aktive forbindelser" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Føj til bogmærker" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Føj nuværende forbindelse til dine bogmærker" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Tag skærmbillede" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Tag et skærmbillede af den aktive forbindelse" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Send Ctrl+Alt+Del til aktiv forbindelse" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Vis den nuværende maskine i fuldskærm" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Original størrelse" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Justerer vinduet til størrelsen af fjernskrivebordet" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "S_kalering" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Tilpas den fjerne skærm til den aktuelle vinduesstørrelse" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Skrivebeskyttet" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Deaktiver mus og tastatur" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Værktøjslinje" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Vis eller skjul værktøjslinjen" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Statusbjælke" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Vis eller skjul statusbjælken" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Side_panel" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Vis eller skjul sidepanelet" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Der opstod en fejl:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre er en VNC-klient til GNOME-skrivebordet" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Kunne ikke indlæse byggefil: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre er en fjernskrivebordsklient til GNOME-skrivebordet" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -753,7 +966,7 @@ "af Free Software Foundation. Enten version 2 af licensen eller (efter eget " "valg) enhver senere version." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -765,7 +978,7 @@ "eller EGNETHED TIL ET BESTEMT FORMÅL. Yderligere detaljer kan læses i GNU " "General Public License." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -773,7 +986,7 @@ "Du skulle have modtaget en kopi af GNU General Public License sammen med " "dette program. Hvis ikke, så se ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Ask Hjorth Larsen\n" @@ -781,28 +994,64 @@ "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Hjemmeside for Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Kunne ikke sammenføje vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Seneste forbindelser" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Åbn %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Tryk Ctrl+Alt for at frigive markøren" +#~| msgid "Failed to resolve avahi hostname: %s\n" +#~ msgid "Failed to request name: %s" +#~ msgstr "Kunne ikke anmode om navn: %s" + +#~ msgid "No error given" +#~ msgstr "Ingen fejl givet" + +#~ msgid "Connection" +#~ msgstr "Forbindelse" + +#~ msgid "Folder" +#~ msgstr "Mappe" + +#~ msgid "host or host:display or host::port" +#~ msgstr "vært eller vært:display eller vært::port" + +#~ msgid "Supported formats" +#~ msgstr "Understøttede formater" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Vælg en VNC-server" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "Kunne ikke finde værtsadressen i filen." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Åbner en .vnc-fil" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- VNC-klient til GNOME" + +#~ msgid "Minimize window" +#~ msgstr "Minimér vindue" + +#~ msgid "_Read only" +#~ msgstr "_Skrivebeskyttet" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Tryk Ctrl+Alt for at frigive markøren" #~ msgid "Editing a bookmark" #~ msgstr "Redigerer et bogmærker" diff -Nru vinagre-2.26.1/po/de.po vinagre-2.29.1/po/de.po --- vinagre-2.26.1/po/de.po 2009-03-26 18:20:03.000000000 +0000 +++ vinagre-2.29.1/po/de.po 2009-08-28 17:21:05.000000000 +0100 @@ -5,13 +5,15 @@ # Mario Blättermann , 2008, 2009. # Nathan-J. Hirschauer , 2009. # Christian Kirbach , 2009. +# Jochen Skulj , 2009. # msgid "" msgstr "" "Project-Id-Version: vinagre\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-21 20:59+0100\n" -"PO-Revision-Date: 2009-03-21 21:03+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=vinagre&component=general\n" +"POT-Creation-Date: 2009-08-25 20:00+0000\n" +"PO-Revision-Date: 2009-08-25 22:04+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -19,137 +21,132 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Info" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Hilfe" #: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 msgid "Access remote desktops" -msgstr "Auf entfernte Desktops zugreifen" +msgstr "Auf entfernte Bildschirme zugreifen" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" -msgstr "Betrachter für entfernte Desktops" +msgstr "Betrachter für entfernte Bildschirme" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Legitimation benötigt" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Alle obigen Felder sind obligatorisch" -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Verbindungseinstellungen" +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Legitimation benötigt" -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Verbindung" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Ordner" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Schnittstelle" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Einstellungen" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Eltern-Ordner" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Mit welcher Maschine möchten Sie sich verbinden?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Alle obigen Felder sind obligatorisch" - -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Lesezeichen" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Verbindung" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Verbindungseinstellungen" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Ordner" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Rechner:" -#: ../data/vinagre.glade.h:12 -msgid "Preferences" +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Schnittstelle" + +#: ../data/vinagre.ui.h:9 +msgid "Options" msgstr "Einstellungen" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "Reiter bei einer einzigen aktiven Verbindung anzeigen/nicht anzeigen" +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Eltern-Ordner" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Menü-Zugriffstasten (Tastenkombinationen) anzeigen/nicht anzeigen" +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "Einstellungen" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Mit welcher Maschine möchten Sie sich verbinden?" + +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "Reiter immer _anzeigen" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Legitimieren" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Vollbild" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Rechner:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Name:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Passwort:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokoll:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "Legitimation _merken" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Skalieren" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "Menüta_stenkombination anzeigen" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Benutzername:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Nur _betrachten" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Aktive Plugins" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "Rechner oder Rechner:Anzeige oder Rechner::Port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given plugin." +msgstr "" +"Liste der aktiven Plugins. Diese enthält den »Ort« der aktiven Plugins. Den " +"»Ort« jedes Plugins finden Sie über .vinagre-plugin heraus." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Maximale Zahl von Chronik-Einträgen im Verbindungsdialog" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu and " @@ -160,7 +157,7 @@ "Sie, dass diese Tastencodes vom Menü abgefangen und nicht zum entfernten " "Rechner weitergeleitet werden." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -169,17 +166,17 @@ "diesen Schlüssel auf »FALSCH«, wenn Reiter nur bei mehr als einer aktiven " "Verbindung angezeigt werden sollen." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Dieser Schlüssel legt die maximal angezeigte Anzahl in der Rechner-" "Auswahlliste fest." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Die genutzte Anwendung für »vnc://«-Adressen" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -188,117 +185,306 @@ "Beim Verbinden mit einem Rechner kann der Client den Server entweder " "anweisen, die Verbindung zu anderen Clients aufrecht zu erhalten oder die " "laufenden Verbindungen zurückzusetzen. Setzen Sie den Wert dieses Schlüssels " -"auf »WAHR«, um den Desktop mit anderen Clients zu teilen. " +"auf »WAHR«, um die Arbeitsfläche mit anderen Clients zu teilen. " -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Verbindung zu anderen Client aufrechterhalten/zurücksetzen" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Reiter bei einer einzigen aktiven Verbindung anzeigen/nicht anzeigen" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Menü-Zugriffstasten (Tastenkombinationen) anzeigen/nicht anzeigen" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" -msgstr "»Entfernter Desktop (VNC)«-Datei" +msgstr "»Entfernter Bildschirm (VNC)«-Datei" #: ../data/vinagre-mime.xml.in.h:2 msgid "Remote Desktop Connection" -msgstr "Verbindung mit entferntem Desktop" +msgstr "Verbindung mit entferntem Bildschirm" + +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Auf Unix/Linux-Terminals zugreifen" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH-Unterstützung" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "»Freigabe«-Markierung »%d« muss 0 oder 1 sein und wird jetzt ignoriert." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Skalierten Modus aktivieren" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +#| msgid "VNC Options" +msgid "VNC Options:" +msgstr "VNC-Optionen:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +#| msgid "VNC Options" +msgid "Show VNC Options" +msgstr "VNC-Optionen anzeigen" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Auf Unix/Linux, Windows und andere Maschinen zugreifen." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Datei konnte nicht verarbeitet werden." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Die Datei ist keine VNC-Datei: Die Gruppe »connection« fehlt." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Die Datei ist keine VNC-Datei: Der Schlüssel »host« fehlt." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC-Optionen" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Nur _betrachten" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Skalieren" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC-Dateien" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Bildschirm-Name:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensionen:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Fehler beim Verbinden zum Rechner." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Legitimationsmethode am Rechner %s wird nicht unterstützt. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Legitimationsmethode nicht unterstützt." + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Legitimationsfehler" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Ein Benutzername ist erforderlich, um auf diese Maschine zuzugreifen." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Ein Passwort ist erforderlich, um auf diese Maschine zuzugreifen." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "S_kalieren" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "" +"Bildschirm des entfernten Rechners an die derzeitige Fenstergröße anpassen" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Maus und Tastatur deaktivieren" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Originalgröße" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Passt das Fenster der Größe des entfernten Bildschirms an" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Strg-Alt-Entf senden" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Strg+Alt+Entf an die entfernte Maschine senden" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Skalieren" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Nur lesend" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Skalieren wird in dieser Installation nicht unterstützt.\n" +"\n" +"Lesen Sie in der in Vinagre mitgelieferten Datei README,\n" +"wie Sie diese Funktion aktivieren können." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC-Unterstützung" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Ein Menü für den schnellen Zugriff auf entfernte Maschinen" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre-Applet-Ersteller" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Vinagre konnte nicht gestartet werden:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Öffnet eine Arbeitsumgebung auf einem entfernten Rechner" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Zugriff auf Ihre Lesezeichen" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Das Protokoll %s wird nicht unterstützt." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Fehler beim Erstellen der Lesezeichen: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Fehler beim Erstellen der Lesezeichen: Die Datei scheint leer zu sein" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Fehler beim Erstellen der Lesezeichen: Die Datei ist keine Lesezeichendatei" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "" "Fehler beim Speichern der Lesezeichen: Die XML-Struktur konnte nicht erstellt " "werden" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "Fehler beim Speichern der Lesezeichen: Die XML-Struktur konnte nicht erstellt " "werden" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Fehler beim Speichern der Lesezeichen: Die XML-Struktur konnte nicht beendet " "werden" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Fehler beim Speichern der Lesezeichen: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "Fehler beim Importieren der Lesezeichen: Die XML-Struktur konnte nicht " "erstellt werden" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Fehler beim Importieren der Lesezeichen: Die XML-Struktur konnte nicht " "erstellt werden" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Fehler beim Importieren der Lesezeichen: Die XML-Struktur konnte nicht fertig " "gestellt werden." -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Fehler beim Importieren der Lesezeichen: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Fehler beim Importieren der Lesezeichen: VNC-Plugin ist nicht ativiert." + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Ordner konnte nicht erstellt werden" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -306,29 +492,29 @@ "Lesezeichendatei wird in das neue Format umgewandelt. Dieser Vorgang ist " "vermutlich nur einmal erforderlich." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Fehler beim Öffnen der alten Lesezeichendatei: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Importieren abgebrochen" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Alte Lesezeichendatei konnte nicht entfernt werden" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Hauptordner" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Ungültiger Ordnername" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." @@ -336,432 +522,459 @@ "Der Name »%s« wird in diesem Ordner bereits verwendet. Bitte wählen Sie einen " "anderen Namen." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Ungültiger Name für diesen Eintrag" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "" -"Sind Sie sicher, dass Sie %s aus den Lesezeichen ausschließen möchten?" +msgid "(Protocol: %s)" +msgstr "(Protokoll: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Sind Sie sicher, dass Sie %s aus den Lesezeichen entfernen möchten?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Ordner löschen?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "" "Bedenken Sie, dass alle Dateien und Unterordner hiermit auch gelöscht werden." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Eintrag löschen?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Fehler beim Löschen der Lesezeichen: Eintrag nicht gefunden" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Neuer Ordner" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Datei auswählen" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Unterstützte Formate" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Es gibt keine unterstützten Dateien" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Keines der aktiven Plugins bietet eine Unterstützung für die zu öffnende " +"Datei. Aktivieren Sie weitere Plugins und versuchen Sie es erneut." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Die folgende Datei konnte nicht geöffnet werden:" msgstr[1] "Die folgenden Dateien konnten nicht geöffnet werden:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "" +"Aktives Protokoll konnte nicht in die Protokollliste aufgenommen werden." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Fehler beim Speichern der Chronik-Datei: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "VNC-Server auswählen" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Das Protokoll %s wird nicht unterstützt." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Wählen Sie einen entfernten Bildschirm" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Datei konnte nicht geöffnet werden." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Datei konnte nicht verarbeitet werden." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "»Freigabe«-Markierung »%d« muss 0 oder 1 sein und wird jetzt ignoriert." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Konnte den Rechnernamen in der Datei nicht finden." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Die Datei konnte von keinem der Plugins erkannt werden." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Ungültige Operation" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Die Drag&Drop-Daten sind ungültig." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Nächstgelegene Rechner" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Öffnet eine .vnc-Datei" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Vinagre im Vollbildmodus öffnen" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "Dateiname" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "" "Ein neues Hauptfenster in einer existierenden Instanz von Vinagre erstellen" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Eine von Vinagre verarbeitbare Datei öffnen" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "Dateiname" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[Server:Port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Der folgende Fehler ist aufgetreten:" msgstr[1] "Die folgenden Fehler sind aufgetreten:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "– VNC-Client für GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Betrachter für entfernte Bildschirme" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Führen Sie »vinagre --help« aus, um eine vollständigen Liste der verfügbaren " "Befehlszeilenoptionen zu erhalten" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Avahi-Rechnername konnte nicht aufgelöst werden: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Plugin %s hat bereits einen Browser für den Dienst %s registriert." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Das Hinzufügen eines mDNS-Browsers für Dienst %s ist gescheitert.\"" + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" -msgstr "Suche nach entfernten Rechnern ist fehlgeschlagen: %s\n" +msgstr "Suche nach entfernten Rechnern ist gescheitert: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -msgid "Connection to host %s was closed." -msgstr "Verbindung zum Rechner »%s« wurde geschlossen." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Das Initialisieren eines mDNS-Browsers ist gescheitert: %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "Verbindung zum Rechner %s wurde geschlossen." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Die Verbindung wurde geschlossen." -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Legitimation am Rechner %s ist gescheitert" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Anmeldung gescheitert" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Verbinden …" -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Verbindung schließen" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Plugin-Verwaltung" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Plugin" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Aktiviert" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "K_onfigurieren" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ktivieren" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Alle ak_tivieren" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "Alle _deaktivieren" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "Plugin-_Info" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "Plugin k_onfigurieren" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Einstellungs-Manager konnte nicht gestartet werden." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Fehler beim Verbinden zum Rechner." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Legitimation am Rechner »%s« fehlgeschlagen" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Anmeldung fehlgeschlagen" +#: ../vinagre/vinagre-tab.c:346 +#| msgid "_Full screen" +msgid "Leave fullscreen" +msgstr "Vollbild verlassen" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Legitimationsmethode am Rechner »%s« wird nicht unterstützt. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Legitimationsmethode nicht unterstützt." - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Fehler beim Speichern der zuletzt geöffneten Verbindung." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Fehler beim Speichern des Passwortes im Schlüsselbund." - -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Legitimationsfehler" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Ein Benutzername ist erforderlich, um auf diese Maschine zuzugreifen." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Ein Passwort ist erforderlich, um auf diese Maschine zuzugreifen." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Fenster minimieren" +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Fehler beim Speichern des Passworts im Schlüsselbund." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Skalieren" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Ein Bildschirmfoto der Verbindung konnte nicht aufgenommen werden." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Nur lesend" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Bildschirmfoto speichern" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Bildschirmfoto aufnehmen" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Bildschirmfoto von %s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Strg-Alt-Entf senden" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Fehler beim Speichern des Bildschirmfotos" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Desktop-Name:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +#| msgid "Impossible to get the avatar: %s" +msgid "Impossible to get service property: %s" +msgstr "Diensteigenschaft konnte nicht ermittelt werden: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Verbindung konnte nicht erzeugt werden: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensionen:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Stream-Kanal konnte nicht akzeptiert werden: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Ein Bildschirmfoto der Verbindung konnte nicht aufgenommen werden." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Kontaktname konnte nicht ermittelt werden: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "Bildschirmfoto von %s" +msgid "Impossible to get the avatar: %s" +msgstr "Benutzerbild konnte nicht ermittelt werden: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Bildschirmfoto speichern" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s möchte seine Arbeitsfläche für Sie freigeben." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Skalieren wird in dieser Installation nicht unterstützt.\n" -"\n" -"Lesen Sie in der in Vinagre mitgelieferten Datei README,\n" -"wie Sie diese Funktion aktivieren können." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Einladung zur Freigabe der Arbeitsfläche" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Maschine" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Ansicht" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Lesezeichen" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Verbinden mit einer entfernten Maschine" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr ".VNC-Datei öffnen" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Programm beenden" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Programmeinstellungen bearbeiten" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "Lesezeichen _öffnen" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Mit dieser Maschine verbinden" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "Lesezeichen _bearbeiten" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Eigenschaften des gewählten Lesezeichens bearbeiten" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "Lesezeichen ent_fernen" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Aktuelle Auswahl aus den Lesezeichen entfernen" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Neuer Ordner" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Neuen Ordner erstellen" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "I_nhalt" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Vinagre-Handbuch öffnen" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Info zu Vinagre" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Werkzeugleiste" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Werkzeugleiste anzeigen oder ausblenden" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Statusleiste" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Statusleiste anzeigen oder ausblenden" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Seiten_leiste" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Seitenleiste anzeigen oder ausblenden" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Aktuelle Verbindung schließen" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Alle schließen" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Alle aktiven Verbindungen schließen" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "Lesezeichen hinzufügen" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Aktuelle Verbindung zu Lesezeichen hinzufügen" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Bildschirmfoto aufnehmen" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Bildschirmfoto der aktiven Verbindung aufnehmen" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Strg+Alt+Entf über die aktive Verbindung senden" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Aktuelle Maschine im Vollbildmodus darstellen" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Originalgröße" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Passt das Fenster der Größe des entfernten Desktops an" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "S_kalieren" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "" -"Bildschirm des entfernten Rechners an die derzeitige Fenstergröße anpassen" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Nur lesend" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Maus und Tastatur deaktivieren" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Werkzeugleiste" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Werkzeugleiste anzeigen oder ausblenden" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Statusleiste" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Statusleiste anzeigen oder ausblenden" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Seiten_leiste" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Seitenleiste anzeigen oder ausblenden" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Ein Fehler ist aufgetreten:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre ist ein VNC-Client für den GNOME-Desktop" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Builder-Datei konnte nicht geöffnet werden: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "" +"Vinagre ist ein Betracher für entfernte Bildschirme für die GNOME-" +"Arbeitsumgebung" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -774,7 +987,7 @@ "entweder in Version 2 der Lizenz oder (nach Ihrem Ermessen) in jeder " "folgenden Lizenz." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR " @@ -786,7 +999,7 @@ "für weitere Informationen bitten in der GNU General Public License (GNU GPL) " "nach." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -795,36 +1008,81 @@ "License erhalten haben. Wenn dem nicht so ist, siehe ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Andre Klapper \n" -"Mario Blättermann \n" +"Mario Blättermann \n" "Nathan-J. Hirschauer \n" -"Christian Kirbach " +"Christian Kirbach \n" +"Jochen Skulj " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre-Webseite" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Die Datei »vinagre-ui.xml« konnte nicht zusammengeführt werden: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Zuletzt geöffnete Verbindungen" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s:%d öffnen" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Drücken Sie Strg+Alt, um den Mauszeiger freizugeben" +#~ msgid "Minimize window" +#~ msgstr "Fenster minimieren" + +#~ msgid "Failed to request name: %s" +#~ msgstr "Name konnte nicht aufgelöst werden: %s" + +#~ msgid "No error given" +#~ msgstr "Kein Fehler angegeben" + +#~ msgid "_Plugins" +#~ msgstr "_Plugins" + +#~ msgid "Select plugins" +#~ msgstr "Plugins auswählen" + +#~ msgid "Supported formats" +#~ msgstr "Unterstützte Formate" + +#~ msgid "Connection" +#~ msgstr "Verbindung" + +#~ msgid "Folder" +#~ msgstr "Ordner" + +#~ msgid "host or host:display or host::port" +#~ msgstr "Rechner oder Rechner:Anzeige oder Rechner::Port" + +#~ msgid "Choose a VNC Server" +#~ msgstr "VNC-Server auswählen" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "Konnte den Rechnernamen in der Datei nicht finden." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Öffnet eine .vnc-Datei" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "– VNC-Client für GNOME" + +#~ msgid "Error saving the credential on the keyring." +#~ msgstr "Fehler beim Speichern des Passwortes im Schlüsselbund." + +#~ msgid "_Read only" +#~ msgstr "_Nur lesend" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Drücken Sie Strg+Alt, um den Mauszeiger freizugeben" #~ msgid "Editing a bookmark" #~ msgstr "Lesezeichen bearbeiten" @@ -864,9 +1122,6 @@ #~ "Skalieren funktioniert mit Composited-Fenstern nicht fehlerfrei. " #~ "Deaktivieren Sie die visuellen Effekte und versuchen Sie es noch einmal." -#~ msgid "_Port:" -#~ msgstr "_Port:" - #~ msgid "Image" #~ msgstr "Bild" diff -Nru vinagre-2.26.1/po/el.po vinagre-2.29.1/po/el.po --- vinagre-2.26.1/po/el.po 2009-04-04 12:06:52.000000000 +0100 +++ vinagre-2.29.1/po/el.po 2009-09-17 15:20:20.000000000 +0100 @@ -1,9 +1,7 @@ -# translation of vinagre.HEAD.po to Greek -# Greek translation of vinagre. -# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER +# Greek translation of Vinagre. +# Copyright (C) 2008 - 2009, Free Software Foundation, Inc. # This file is distributed under the same license as the vinagre package. # -# # Giannis Katsampirhs , 2008. # Simos Xenitellis , 2008. # Konstantinos Kouratoras , 2008. @@ -12,21 +10,20 @@ msgstr "" "Project-Id-Version: vinagre.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-27 11:20+0000\n" -"PO-Revision-Date: 2009-02-28 13:20+0100\n" +"POT-Creation-Date: 2009-09-11 19:02+0300\n" +"PO-Revision-Date: 2009-08-24 18:52+0300\n" "Last-Translator: Jennie Petoumenou \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Περί" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Βοήθεια" @@ -35,127 +32,121 @@ msgstr "Πρόσβαση σε απομακρυσμένους υπολογιστές" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Σύνδεση απομακρυσμένης επιφ. εργασίας" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Απαιτείται πιστοποίηση" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Επιλογές σύνδεσης" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Σύνδεση" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Φάκελος" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Διασύνδεση" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Επιλογές" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Γονικός φάκελος" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Με ποιο σύστημα επιθυμείτε να συνδεθείτε;" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Όλα τα παραπάνω πεδία είναι υποχρεωτικά" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Όλα τα παραπάνω πεδία είναι υποχρεωτικά." + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Απαιτείται πιστοποίηση" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Σελιδοδείκτες" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Σύνδεση" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Επιλογές σύνδεσης" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Κατάλογος" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Σύστημα:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Διασύνδεση" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Επιλογές" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Γονικός Φάκελος" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Προτιμήσεις" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Αν θα πρέπει να φαίνονται οι καρτέλες ακόμα και αν υπάρχει μόνο μία ενεργή " -"σύνδεση" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Με ποιο σύστημα επιθυμείτε να συνδεθείτε;" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "" -"Αν θα πρέπει να φαίνονται οι επιταχυντές του μενού (πλήκτρα συντόμευσης)" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Πάντα προβολή καρτελών" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Πιστοποίηση" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Πλήρης οθόνη" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Σύστημα:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "Ό_νομα:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Κωδικός:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Πρωτόκολλο" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Απομνημόνευση του συνθηματικού" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Κλιμάκωση" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Προβολή συντομεύσεων για το μενού" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "Ό_νομα χρήστη:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Προβολή μόνο" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Ενεργά πρόσθετα" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "σύστημα ή σύστημα:οθόνη ή σύστημα:πόρτα" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Λίστα των ενεργών πρόσθετων. Περιέχει τις \"Τοποθεσίες\" των ενεργών " +"πρόσθετων. Δείτε το αρχείο vinagre-plugin για το πώς θα βρείτε την " +"\"Τοποθεσία\" ενός συγκεκριμένου πρόσθετου." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Μέγιστος αριθμός στοιχείων ιστορικού στο διάλογο σύνδεσης" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -166,7 +157,7 @@ "ενεργοποιημένες, τα πλήκτρα εκείνα θα ανακόπτονται από το μενού και δε θα " "αποστέλλονται στο απομακρυσμένο σύστημα." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -175,16 +166,16 @@ "\" για να φαίνονται οι καρτέλες μόνο όταν υπάρχει περισσότερες από μία " "ενεργές συνδέσεις." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Ορίζει το μέγιστο αριθμό αντικειμένων στη λίστα καταχωρήσεων συστημάτων." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Ο διαχειριστής για URL \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -195,10 +186,22 @@ "συνδέσεις. Ορίστε την τιμή σε αληθή για διαμοιρασμό της επιφάνειας εργασίας " "με άλλους πελάτες." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Αν θα πρέπει να μείνουν συνδεδεμένοι οι άλλοι πελάτες" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Αν θα πρέπει να φαίνονται οι καρτέλες ακόμα και αν υπάρχει μόνο μία ενεργή " +"σύνδεση" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "" +"Αν θα πρέπει να φαίνονται οι επιταχυντές του μενού (πλήκτρα συντόμευσης)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Αρχείο (VNC) απομακρυσμένου συστήματος" @@ -207,102 +210,287 @@ msgid "Remote Desktop Connection" msgstr "Σύνδεση σε απομακρυσμένο υπολογιστή" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Πρόσβαση Unix/Linux τερματικών" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Θύρα:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Υποστήριξη SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Εσφαλμένη τιμή για τη σημαία 'shared': %d. Έπρεπε να είναι 0 ή 1. Δεν " +"λαμβάνεται υπόψη." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Ενεργοποίησης κλιμακούμενης λειτουργίας" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Επιλογές VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Εμφάνιση Επιλογών VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Πρόσβαση σε συστήματα Unix/Linux, Windows και άλλα." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Αδυναμία ανάλυσης του αρχείου." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Το αρχείο δεν είναι VNC: Λείπει η ομάδα \"συνδέσεις\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Το αρχείο δεν είναι VNC: Λείπει η λέξη κλειδί \"σύστημα\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Επιλογές VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Προβολή μόνο" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Κλιμάκωση" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Αρχεία VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Όνομα υπολογιστή:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Διαστάσεις:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Σφάλμα κατά τη σύνδεση στον host." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Η μέθοδος πιστοποίησης στο σύστημα %s δεν υποστηρίζεται. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Η μέθοδος πιστοποίησης δεν υποστηρίζεται" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Σφάλμα πιστοποίησης" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Απαιτείται όνομα χρήστη για την πρόσβαση στο σύστημα." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Απαιτείται συνθηματικό για την πρόσβαση στο σύστημα." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "_Κλιμάκωση" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "" +"Προσαρμόζει την απομακρυσμένη οθόνη στο μέγεθος του τρέχοντος παραθύρου" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "" +"Δεν αποστέλονται κινήσεις του ποντικιού ή πληκτρολογήσεις του πληκτρολογίου" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Αρχικό μέγεθος" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "" +"Προσαρμόζει το παράθυρο στο μέγεθος της απομακρυσμένης επιφάνειας εργασίας" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Αποστολή Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Στέλνει Ctrl+Alt+Del στο απομακρυσμένο σύστημα" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Κλιμάκωση" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Μόνο για ανάγνωση" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Η κλιμάκωση δεν υποστηρίζεται στην εγκατάσταση αυτή.\n" +"\n" +"Διαβάστε το αρχείο README (υπάρχει με το Vinagre) για να μάθετε πως " +"ενεργοποιείτε αυτό το χαρακτηριστικό." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Υποστήριξη VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Μενού για γρήγορη πρόσβαση σε απομακρυσμένα συστήματα" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Εργοστάσιο εφαρμογών Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Δεν ήταν δυνατή η εκτέλεση του vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Άνοιγμα απομακρυσμένης επιφάνειας εργασίας" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Πρόσβαση στους σελιδοδείκτες" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Το πρωτόκολλο %s δεν υποστηρίζεται." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Σφάλμα κατά την αρχικοποίηση των σελιδοδεικτών: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Άγνωστο σφάλμα" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Σφάλμα κατά την αρχικοποίηση των σελιδοδεικτών: Το αρχείο μοιάζει κενό" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Σφάλμα κατά την αρχικοποίηση των σελιδοδεικτών: Το αρχείο δεν είναι αρχείο " "σελιδοδεικτών vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "" "Σφάλμα κατά την αποθήκευση των σελιδοδεικτών: Δεν ήταν δυνατή η δημιουργία " "της XML δομής" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "Σφάλμα κατά την αποθήκευση των σελιδοδεικτών: Δεν ήταν δυνατή η αρχικοποίηση " "της XML δομής" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Σφάλμα κατά την αποθήκευση των σελιδοδεικτών: Δεν ήταν δυνατή η ολοκλήρωση " "της δημιουργίας της XML δομής" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Σφάλμα κατά την αποθήκευση των σελιδοδεικτών: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "Σφάλμα κατά την αναβάθμιση των σελιδοδεικτών: Δεν ήταν δυνατή η δημιουργία " "της XML δομής" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Σφάλμα κατά την αναβάθμιση των σελιδοδεικτών: Δεν ήταν δυνατή η αρχικοποίηση " "της XML δομής" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Σφάλμα κατά την αναβάθμιση των σελιδοδεικτών: Δεν ήταν δυνατή" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Σφάλμα κατά την αναβάθμιση των σελιδοδεικτών: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" +"Σφάλμα κατά την μεταφορά των σελιδοδεικτών: το VNC πρόσθετο δεν είναι " +"ενεργοποιημένο" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Δεν ήταν δυνατή η δημιουργία καταλόγου" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -310,29 +498,29 @@ "Αναβάθμιση του αρχείου σελιδοδεικτών και προσαρμογή του στη νέα μορφή. " "Λογικά, η λειτουργία αυτή θα εκτελεστεί μόνο μία φορά." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Σφάλμα κατά το άνοιγμα του παλιού αρχείου σελιδοδεικτών: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Ακύρωση αναβάθμισης" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Δεν ήταν δυνατή η διαγραφή του παλιού αρχείου σελιδοδεικτών" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Ριζικός κατάλογος" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Μη έγκυρο όνομα για αυτόν τον κατάλογο" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." @@ -340,437 +528,459 @@ "Το όνομα \"%s\" είναι ήδη σε χρήση σε αυτόν τον κατάλογο. Παρακαλώ δοκιμάστε " "με άλλο όνομα." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Μη έγκυρο όνομα για αυτό το αντικείμενο" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" +msgid "(Protocol: %s)" +msgstr "(Πρωτόκολλο: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" msgstr "" -"Είστε σίγουρος ότι θέλετε να εξάγετε το %s από τους σελιδοδείκτες;" +"Είστε σίγουρος/η ότι θέλετε να απομακρύνετε το %s από τους σελιδοδείκτες;" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Να διαγραφεί ο κατάλογος;" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Προσοχή: όλοι οι υποκατάλογοι και τα αντικείμενα θα διαγραφούν." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Να διαγραφεί το αντικείμενο;" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Σφάλμα κατά την αφαίρεση του σελιδοδείκτη: Δε βρέθηκε η καταχώριση" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Νέος κατάλογος" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Επιλογή του αρχείου" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Υποστηριζόμενες μορφές" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Δεν υπάρχουν υποστηριζόμενα αρχεία" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Κανένα από τα ενεργά πρόσθετα δεν παρέχουν υποστηριζόμενο αρχείο για " +"άνοιγμα. Ενεργοποιήστε μερικά πρόσθετα και προσπαθήστε εκ νέου." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Το αρχείο δεν μπόρεσε να προσπελαστεί:" msgstr[1] "Τα αρχεία αυτά δεν μπόρεσαν να προσπελαστούν:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Αδύνατη η λήψη του ενεργού πρωτοκόλλου από την λίστα πρωτοκόλλων." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Σφάλμα κατά την αποθήκευση του αρχείου ιστορικού: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Επιλέξτε έναν εξυπηρετητή VNC" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Επιλέξτε μια Απομακρυσμένη Επιφάνεια Εργασίας" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Το πρωτόκολλο %s δεν υποστηρίζεται." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Αδυναμία ανοίγματος αρχείου." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Αδυναμία ανάλυσης του αρχείου." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Το αρχείο δεν αναγνωρίστηκε από κάποιο πρόσθετο." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Εσφαλμένη τιμή για τη σημαία 'shared': %d. Έπρεπε να είναι 0 ή 1. Δεν " -"λαμβάνεται υπόψη." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "" -"Δεν ήταν δυνατή η εύρεση της διεύθυνσης του κεντρικού συστήματος στο αρχείο." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Μη έγκυρη λειτουργία" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "" "Τα δεδομένα που ελήφθησαν μέσω της λειτουργίας μεταφοράς και απόθεσης δεν " "είναι έγκυρα." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Γειτονικά συστήματα" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Ανοίγει ένα αρχείο .vnc" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Άνοιγμα του vinagre σε λειτουργία πλήρους οθόνης." -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "όνομα αρχείου" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "" "Δημιουργία νέου κορυφαίου παραθύρου σε ένα υπάρχον στιγμιότυπο του vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Άνοιγμα αρχείου που αναγνωρίζεται από το vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "όνομα αρχείου" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[εξυπηρετητής:θύρα]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Συνέβη το ακόλουθο σφάλμα:" msgstr[1] "Συνέβησαν τα ακόλουθα σφάλματα:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- Πελάτης VNC για το GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "Θεατής Απομακρυσμένης Επιφάνειας Εργασίας" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Εκτελέστε την εντολή 'vinagre --help' για να δείτε μία πλήρη λίστα με τις " "διαθέσιμες επιλογές εντολών για το vinagre" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Αποτυχία εύρεσης ονόματος συστήματος avahi: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "" +"Στο πρόσθετο %s έχει ήδη δηλωθεί κάποιος φυλλομετρητής για την υπηρεσία %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Αποτυχία προσθήκης φυλλομετρητού mDNS για την υπηρεσία %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Αποτυχία αναζήτησης συστημάτων: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Αποτυχία εκκίνησης φυλλομετρητού mDNS: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Η σύνδεση με το σύστημα %s έχει τερματιστεί." +msgid "Connection to host %s was closed." +msgstr "Η σύνδεση με το σύστημα %s έχει τερματιστεί." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Η σύνδεση έχει τερματιστεί" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Απέτυχε η πιστοποίηση με το σύστημα %s" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Απέτυχε η πιστοποίηση" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Γίνεται σύνδεση..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Κλείσιμο σύνδεσης" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Διαχειριστής Προσθέτων" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Πρόσθετο" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Ενεργοποιημένο" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Ρύθμιση" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "Ε_νεργοποίηση" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Εν_εργοποίηση Όλων" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Απενεργοποίηση Όλων" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Περί Πρόσθετου" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "_Ρύθμιση Πρόσθετου" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Δεν είναι δυνατή η ρύθμιση του διαχειριστή προτιμήσεων." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Σφάλμα κατά τη σύνδεση στον host." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Απέτυχε η πιστοποίηση στο σύστημα %s" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Έξοδος από την πλήρη οθόνη" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Απέτυχε η πιστοποίηση" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Η μέθοδος πιστοποίησης στο σύστημα %s δεν υποστηρίζεται. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Η μέθοδος πιστοποίησης δεν υποστηρίζεται" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Σφάλμα κατά την αποθήκευση της πρόσφατης σύνδεσης." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Σφάλμα κατά την αποθήκευση του συνθηματικού στην κλειδοθήκη." - -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Σφάλμα πιστοποίησης" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Απαιτείται όνομα χρήστη για την πρόσβαση στο σύστημα." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Απαιτείται συνθηματικό για την πρόσβαση στο σύστημα." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Σφάλμα κατά την αποθήκευση των συνθηματικών στην κλειδοθήκη." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Ελαχιστοποίηση του παραθύρου" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Αδυναμία λήψης στιγμιοτύπου της σύνδεσης." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Κλιμάκωση" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Αποθήκευση στιγμιότυπου" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Μόνο για ανάγνωση" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Στιγμιότυπο του %s" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Λήψη στιγμιότυπου" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Σφάλμα κατά την αποθήκευση του στηγμιότυπου" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Αποστολή Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Αδύνατη η λήψη των ιδιοτήτων της υπηρεσίας: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Όνομα υπολογιστή:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Δεν ήταν δυνατή η σύνδεση: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Θύρα:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Αδύνατη η αποδοχή του αγωγού ροής: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Διαστάσεις:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Αδύνατη η λήψη του ονόματος της επαφής: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Αδυναμία λήψης στιγμιοτύπου της σύνδεσης." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Αδύνατη η λήψη της αναπαράστασης (avatar) του χρήστη: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "Στιγμιότυπο του %s" +msgid "%s wants to share his desktop with you." +msgstr "Ο/η %s επιθυμεί να μοιραστεί σας την επιφάνεια εργασίας του/της." -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Αποθήκευση στιγμιότυπου" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Η κλιμάκωση δεν υποστηρίζεται στην εγκατάσταση αυτή.\n" -"\n" -"Διαβάστε το αρχείο README (υπάρχει με το Vinagre) για να μάθετε πως " -"ενεργοποιείτε αυτό το χαρακτηριστικό." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Πρόσκληση διαμοιρασμού επιφάνειας εργασίας" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Σύστημα" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Επεξεργασία" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Προβολή" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Σελιδοδείκτες" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Σύνδεση σε απομακρυσμένο σύστημα" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Άνοιγμα ενός αρχείου .vnc" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Τερματισμός του προγράμματος" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Επεξεργασία των επιλογών εφαρμογής" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "Ά_νοιγμα σελιδοδείκτη" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Σύνδεση σε αυτό το σύστημα" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Επεξεργασία σελιδοδεικτών" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Επεξεργασία των λεπτομερειών στους επιλεγμένους σελιδοδείκτες" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Αφαίρεση από τους σελιδοδείκτες" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Αφαίρεση της τρέχουσας επιλεγμένης σύνδεσης από τους σελιδοδείκτες" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Νέος κατάλογος" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Δημιουργία νέου καταλόγου" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Περιεχόμενα" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Άνοιγμα του οδηγού για το vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Σχετικά με την εφαρμογή" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Εργαλειοθήκη" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Εμφάνιση ή απόκρυψη της εργαλειοθήκης" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Μπάρα κατάστασης" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Εμφάνιση ή απόκρυψη της μπάρας κατάστασης" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Πλαϊνός _πίνακας" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Εμφάνιση ή απόκρυψη της πλαϊνής μπάρας" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Κλείσιμο της τρέχουσας σύνδεσης" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "Κ_λείσιμο όλων" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Κλείσιμο όλων των ενεργών συνδέσεων" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Προσθήκη στους σελιδοδείκτες" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Προσθήκη της τρέχουσας σύνδεσης στους σελιδοδείκτες" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Λήψη στιγμιότυπου" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Λήψη στιγμιότυπου μιας ενεργής σύνδεσης" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Αποστολή Ctrl+Alt+Del στην ενεργή σύνδεση" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Προβολή του τρέχοντος συστήματος σε πλήρη οθόνη" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Αρχικό μέγεθος" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "" -"Προσαρμόζει το παράθυρο στο μέγεθος της απομακρυσμένης επιφάνειας εργασίας" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "_Κλιμάκωση" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "" -"Προσαρμογή της απομακρυσμένης οθόνης στο μέγεθος του τρέχοντος παραθύρου" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Μόνο για ανάγνωση" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Απενεργοποίηση ποντικιού και πληκτρολογίου" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Εργαλειοθήκη" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Εμφάνιση ή απόκρυψη της εργαλειοθήκης" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Μπάρα κατάστασης" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Εμφάνιση ή απόκρυψη της μπάρας κατάστασης" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Πλαϊνός _πίνακας" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Εμφάνιση ή απόκρυψη της πλαϊνής μπάρας" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Προέκυψε σφάλμα:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Το Vinagre είναι ένας VNC πελάτης για το γραφικό περιβάλλον του GNOME" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Δεν φορτώθηκε το δομικό αρχείο: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "" +"Το Vinagre είναι ένας θεατής απομακρυσμένης επιφάνειας εργασίας για την " +"Επιφάνεια Εργασίας GNOME" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -782,7 +992,7 @@ "δημοσιεύεται από το Free Software Foundation· είτε για την έκδοση 2 της " "Άδειας, ή (κατ' επιλογή σας) για κάθε νεότερη έκδοση." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -794,7 +1004,7 @@ "ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Ανατρέξτε στην GNU General Public " "License για περισσότερες λεπτομέρειες." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -803,7 +1013,7 @@ "συνοδευόμενη με αυτό το πρόγραμμα. Αν όχι, ανατρέξτε στο σύνδεσμο ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Ελληνική μεταφραστική ομάδα GNOME\n" @@ -815,25 +1025,66 @@ "\n" "Για περισσότερα δείτε http://www.gnome.gr/" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Δικτυακός τόπος Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Δεν ήταν δυνατή η συγχώνευση του vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Πρόσφατες συνδέσεις" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Σύνδεση με %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Πατήστε Ctrl+Alt για να απελευθερώσετε το δρομέα" +#~| msgid "Failed to resolve avahi hostname: %s\n" +#~ msgid "Failed to request name: %s" +#~ msgstr "Αποτυχία αίτησης του ονόματος: %s" + +#~ msgid "No error given" +#~ msgstr "Δεν δόθηκε σφάλμα" + +#~ msgid "Connection" +#~ msgstr "Σύνδεση" + +#~ msgid "Folder" +#~ msgstr "Φάκελος" + +#~ msgid "host or host:display or host::port" +#~ msgstr "σύστημα ή σύστημα:οθόνη ή σύστημα:πόρτα" + +#~ msgid "Supported formats" +#~ msgstr "Υποστηριζόμενες μορφές" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Επιλέξτε έναν εξυπηρετητή VNC" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "" +#~ "Δεν ήταν δυνατή η εύρεση της διεύθυνσης του κεντρικού συστήματος στο " +#~ "αρχείο." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Ανοίγει ένα αρχείο .vnc" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- Πελάτης VNC για το GNOME" + +#~ msgid "Error saving the credential on the keyring." +#~ msgstr "Σφάλμα κατά την αποθήκευση του συνθηματικού στην κλειδοθήκη." + +#~ msgid "Minimize window" +#~ msgstr "Ελαχιστοποίηση του παραθύρου" + +#~ msgid "_Read only" +#~ msgstr "_Μόνο για ανάγνωση" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Πατήστε Ctrl+Alt για να απελευθερώσετε το δρομέα" diff -Nru vinagre-2.26.1/po/en_GB.po vinagre-2.29.1/po/en_GB.po --- vinagre-2.26.1/po/en_GB.po 2009-03-26 18:20:03.000000000 +0000 +++ vinagre-2.29.1/po/en_GB.po 2009-09-17 15:20:20.000000000 +0100 @@ -1,29 +1,28 @@ # English (British) translation. -# Copyright (C) 2008 THE vinagre'S COPYRIGHT HOLDER -# This file is distributed under the same license as the vinagre package. +# Copyright (C) 2008 vinagre's COPYRIGHT HOLDER +# This file is distributed under the same licence as the vinagre package. # Philip Withnall , 2008, 2009. # Jen Ockwell , 2009. -# +# Bruce Cowan , 2009. # msgid "" msgstr "" "Project-Id-Version: vinagre\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-21 20:09+0000\n" -"PO-Revision-Date: 2009-03-21 20:31+0000\n" -"Last-Translator: Jen Ockwell \n" -"Language-Team: English/GB \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-12 21:51+0100\n" +"PO-Revision-Date: 2009-08-31 13:30+0100\n" +"Last-Translator: Bruce Cowan \n" +"Language-Team: British English \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" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_About" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Help" @@ -32,125 +31,121 @@ msgstr "Access remote desktops" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Remote Desktop Viewer" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Authentication is required" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Connection options" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Connection" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Folder" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interface" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Options" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Parent Folder" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Which machine do you want to connect to?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "All fields above are mandatory" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "All fields above are mandatory" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Authentication is required" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Bookmarks" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Connection" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Connection options" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Folder" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Host:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interface" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Options" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Parent Folder" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Preferences" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Whether we should show tabs even when there is only one active connection" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Whether we should show the menu accelerators (shortcut keys)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Which machine do you want to connect to?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Always show tabs" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Authenticate" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Full screen" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Host:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Name:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Password:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protocol:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Remember this credential" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Scaling" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Show menu shortcuts" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Username:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_View only" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Active plugins" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "host or host:display or host::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Maximum number of history items in connect dialogue" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -160,7 +155,7 @@ "Note that if they are enabled, those keys will be intercepted by the menu " "and will not be sent to the remote host." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -168,15 +163,15 @@ "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Specifies the maximum number of items in the host dropdown entry." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "The handler for \"vnc://\" URLs" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -186,10 +181,20 @@ "clients connected or to drop the existent connections. Set the value to true " "to share the desktop with the other clients." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Whether we should leave other clients connected" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Whether we should show tabs even when there is only one active connection" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Whether we should show the menu accelerators (shortcut keys)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Remote Desktop (VNC) file" @@ -198,92 +203,271 @@ msgid "Remote Desktop Connection" msgstr "Remote Desktop Connection" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Access Unix/Linux terminals" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH support" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Enable scaled mode" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC Options:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Show VNC Options" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Access Unix/Linux, Windows and other machines." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Could not parse the file." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "The file is not a VNC one: Missing the group \"connection\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "The file is not a VNC one: Missing the key \"host\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC Options" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_View only" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Scaling" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC Files" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Desktop Name:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensions:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Error connecting to host." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Authentication method to host %s is unsupported. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Authentication unsupported" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Authentication error" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "A username is required in order to access this machine." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "A password is required in order to access this machine." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "S_caling" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Fits the remote screen into the current window size" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Does not send mouse and keyboard events" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Original size" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Adjusts the window to the remote desktop's size" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Send Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Sends Ctrl+Alt+Del to the remote machine" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Scaling" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Read only" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC support" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "A menu to quickly access remote machines" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre Applet Factory" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Could not run Vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Open Remote Desktop Viewer" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Access your bookmarks" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "The protocol %s is not supported." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Error while initialising bookmarks: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Unknown error" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Error while initialising bookmarks: The file seems to be empty" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Error while initialising bookmarks: The file is not a Vinagre bookmarks file" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Error while saving bookmarks: Failed to create the XML structure" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Error while saving bookmarks: Failed to initialise the XML structure" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Error while saving bookmarks: Failed to finalise the XML structure" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Error while saving bookmarks: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Error while migrating bookmarks: Failed to create the XML structure" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Error while migrating bookmarks: Failed to initialise the XML structure" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Error while migrating bookmarks: Failed to finalise the XML structure" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Error while migrating bookmarks: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Error while migrating bookmarks: VNC plugin is not activated" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Failed to create the directory" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -291,457 +475,480 @@ "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Error opening old bookmarks file: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migration cancelled" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Could not remove the old bookmarks file" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Root Folder" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Invalid name for this folder" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." msgstr "" "The name \"%s\" is already used in this folder. Please use a different name." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Invalid name for this item" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Are you sure you want to remove %s from bookmarks?" +msgid "(Protocol: %s)" +msgstr "(Protocol: %s)" -#: ../src/vinagre-bookmarks-ui.c:297 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Are you sure you want to remove %s from bookmarks?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Remove Folder?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Notice that all its subfolders and items will be removed as well." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Remove Item?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Error removing bookmark: Entry not found" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "New Folder" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Choose the file" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Supported formats" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "There are no supported files" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"None of the active plugins offer a supported file to be opened. Activate some " +"plugins and try again." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "The following file could not be opened:" msgstr[1] "The following files could not be opened:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Could not get the active protocol in the protocol list." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Error while saving history file: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Choose a VNC Server" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "The protocol %s is not supported." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Choose a Remote Desktop" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Could not open the file." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Could not parse the file." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Could not find the host address in the file." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "The file was not recognised by any of the plugins." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Invalid operation" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Data received from drag and drop operation is invalid." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Hosts nearby" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Opens a .vnc file" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Open Vinagre in fullscreen mode" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "filename" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Create a new top-level window in an existing instance of Vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Open a file recognised by Vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "filename" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "The following error has occurred:" msgstr[1] "The following errors have occurred:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- VNC Client for GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Remote Desktop Viewer" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Run 'vinagre --help' to see a full list of available command line options" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Failed to resolve Avahi hostname: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Plugin %s has already registered a browser for service %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Failed to add mDNS browser for service %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Failed to browse for hosts: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Failed to initialise mDNS browser: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Connection to host %s was closed." +msgid "Connection to host %s was closed." +msgstr "Connection to host %s was closed." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Connection closed" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Authentication to host %s has failed" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Authentication failed" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." -msgstr "Connecting..." +msgstr "Connecting…" -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Close connection" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Plugin Manager" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Plugin" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Enabled" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "C_onfigure" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ctivate" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ac_tivate All" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Deactivate All" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_About Plugin" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "C_onfigure Plugin" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Cannot initialise preferences manager." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Error connecting to host." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Authentication to host %s has failed" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Authentication failed" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Authentication method to host %s is unsupported. (%u)" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Leave fullscreen" -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Authentication unsupported" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Error saving recent connection." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Error saving the credential on the keyring." - -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Authentication error" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "A username is required in order to access this machine." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Error saving the credentials on the keyring." -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "A password is required in order to access this machine." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimise window" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Scaling" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Could not get a screenshot of the connection." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Read only" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Save Screenshot" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Take screenshot" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Screenshot of %s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Send Ctrl-Alt-Del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Error saving screenshot" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Desktop Name:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Impossible to get service property: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Impossible to create the connection: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensions:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Impossible to accept the stream tube: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Could not get a screenshot of the connection." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Impossible to get the contact name: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "Screenshot of %s" +msgid "Impossible to get the avatar: %s" +msgstr "Impossible to get the avatar: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Save Screenshot" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s wants to share his desktop with you." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Desktop sharing invitation" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Machine" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Edit" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_View" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Bookmarks" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Connect to a remote machine" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Open a .vnc file" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Quit the program" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Edit the application preferences" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Open bookmark" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Connect to this machine" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Edit bookmark" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Edit the details of selected bookmark" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Remove from bookmarks" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Remove current selected connection from bookmarks" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_New Folder" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Create a new folder" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Contents" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Open the vinagre manual" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "About this application" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Toolbar" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Show or hide the toolbar" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Statusbar" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Show or hide the statusbar" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Side _Panel" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Show or hide the side panel" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Close the current connection" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "C_lose All" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Close all active connections" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Add to bookmarks" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Add current connection to your bookmarks" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Take screenshot" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Take a screenshot of active connection" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Send Ctrl+Alt+Del to active connection" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "View the current machine in full screen" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Original size" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Adjusts the window to the remote desktop's size" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "S_caling" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Fit the remote screen into the current window size" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Read only" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Disable mouse and keyboard" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Toolbar" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Show or hide the toolbar" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Statusbar" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Show or hide the statusbar" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Side _Panel" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Show or hide the side panel" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "An error has occurred:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre is a VNC client for the GNOME Desktop" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Could not load builder file: %s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre is a remote desktop viewer for the GNOME Desktop" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -753,7 +960,7 @@ "Foundation; either version 2 of the Licence, or (at your option) any later " "version." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -765,7 +972,7 @@ "FOR A PARTICULAR PURPOSE. See the GNU General Public Licence for more " "details." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -773,34 +980,64 @@ "You should have received a copy of the GNU General Public Licence along with " "this program. If not, see ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Philip Withnall \n" -"Jen Ockwell " +"Jen Ockwell \n" +"Bruce Cowan " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre Website" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Could not merge vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Recent connections" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Open %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Press Ctrl+Alt to release the cursor" +#~ msgid "Connection" +#~ msgstr "Connection" + +#~ msgid "Folder" +#~ msgstr "Folder" + +#~ msgid "host or host:display or host::port" +#~ msgstr "host or host:display or host::port" + +#~ msgid "Supported formats" +#~ msgstr "Supported formats" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Choose a VNC Server" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "Could not find the host address in the file." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Opens a .vnc file" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- VNC Client for GNOME" + +#~ msgid "Minimize window" +#~ msgstr "Minimise window" + +#~ msgid "_Read only" +#~ msgstr "_Read only" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Press Ctrl+Alt to release the cursor" #~ msgid "Editing a bookmark" #~ msgstr "Editing a bookmark" @@ -840,9 +1077,6 @@ #~ "Scaling does not work properly on composited windows. Disable the visual " #~ "effects and try again." -#~ msgid "_Port:" -#~ msgstr "_Port:" - #~ msgid "Image" #~ msgstr "Image" diff -Nru vinagre-2.26.1/po/es.po vinagre-2.29.1/po/es.po --- vinagre-2.26.1/po/es.po 2009-04-13 14:28:57.000000000 +0100 +++ vinagre-2.29.1/po/es.po 2009-10-24 13:56:52.000000000 +0100 @@ -2,14 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Jorge González , 2007, 200, 2009. +# Jorge González , 2007, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: vinagre.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-20 21:12+0000\n" -"PO-Revision-Date: 2009-04-12 16:34+0200\n" +"POT-Creation-Date: 2009-09-29 18:50+0000\n" +"PO-Revision-Date: 2009-10-11 11:49+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -18,11 +18,11 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "Acerca _de" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "Ay_uda" @@ -31,126 +31,121 @@ msgstr "Acceda a escritorios remotos" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Visor de escritorios remotos" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Se necesita autenticación." - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Opciones de conexión" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Conexión" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Carpeta" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interfaz" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Opciones" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Carpeta padre" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "¿A qué máquina quiere conectarse?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Todos los campos anteriores son obligatorios" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Todos los campos anteriores son obligatorios" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Se necesita autenticación" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Marcadores" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Conexión" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Opciones de conexión" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Carpeta" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Equipo:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interfaz" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Opciones" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Carpeta padre" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Preferencias" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Indica si se deben mostrar las solapas incluso cuando sólo hay una conexión " -"activa" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "¿A qué máquina quiere conectarse?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Indica si se deben mostrar los aceleradores de menú (teclas rápidas)" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "Mostrar _siempre las solapas" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Autenticar" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Pantalla completa" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Equipo:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nombre:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Contraseña:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protocolo:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Recordar estas credenciales" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "E_scalado" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Mostrar los atajos de menú" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Usuario:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Sólo _visión" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Complementos activos" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "equipo o equipo:pantalla o equipo::puerto" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Lista de complementos activos. Contiene la «Ubicación» de los complementos " +"activos. Consulte el archivo vinagre-plugin para obtener la «Ubicación» de un " +"complemento dado." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Máximo número de elementos históricos en el diálogo de conexión" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -160,7 +155,7 @@ "para activarlos. Note que si están activados, el menú interceptará esas " "teclas y no se enviarán al equipo remoto." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -168,17 +163,17 @@ "Establecer a «true» para mostrar siempre las solapas. Al establecerlo a " "«false» sólo se mostrarán las solapas cuando hay más de una conexión activa." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Especifica el número máximo de elementos en la entrada desplegable de " "equipos." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "El manejador para URL tipo «vnc://»" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -189,10 +184,21 @@ "Establezca el valor a «true» para compartir el escritorio con los otros " "clientes." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Indica si se deben dejar otros clientes conectados" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Indica si se deben mostrar las solapas incluso cuando sólo hay una conexión " +"activa" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Indica si se deben mostrar los aceleradores de menú (teclas rápidas)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Archivo de escritorio remoto (VNC)" @@ -201,93 +207,283 @@ msgid "Remote Desktop Connection" msgstr "Conexión a un escritorio remoto" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Acceder a terminales UNIX/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Puerto:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Soporte para SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:218 +#: ../plugins/vnc/vinagre-vnc-plugin.c:320 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Valor incorrecto para la opción «compartida»: %d. Se supone que debería ser 0 " +"ó 1. Ignorándola." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +#| msgid "_Recent connections" +msgid "_Reverse Connections..." +msgstr "Conexiones _inversas…" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:85 +msgid "Configure incoming VNC connections" +msgstr "Configurar las conexiones VNC entrantes" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:172 +msgid "Enable scaled mode" +msgstr "Activar el modo escalado" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:187 +msgid "VNC Options:" +msgstr "Opciones de VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:189 +msgid "Show VNC Options" +msgstr "Mostrar las opciones de VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:211 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:212 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Acceder a equipos UNIX/Linux, Windows y otros." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:269 +msgid "Could not parse the file." +msgstr "No se pudo analizar el archivo." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:276 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "El archivo no es de VNC: Falta el grupo «connection»." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:282 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "El archivo no es de VNC: Falta la clave «host»." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:349 +msgid "VNC Options" +msgstr "Opciones de VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:360 +#: ../plugins/vnc/vinagre-vnc-tab.c:660 +msgid "_View only" +msgstr "Sólo _visión" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:367 +msgid "_Scaling" +msgstr "E_scalado" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:391 +msgid "VNC Files" +msgstr "Archivos de VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nombre del escritorio:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensiones:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:274 +msgid "Error connecting to host." +msgstr "Error al conectar con el equipo." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:312 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "El método de autenticación contra el equipo %s no está soportado. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:316 +msgid "Authentication unsupported" +msgstr "No se soporta la autenticación" + +#: ../plugins/vnc/vinagre-vnc-tab.c:576 ../plugins/vnc/vinagre-vnc-tab.c:593 +msgid "Authentication error" +msgstr "Error de autenticación" + +#: ../plugins/vnc/vinagre-vnc-tab.c:577 +msgid "A username is required in order to access this machine." +msgstr "Se necesita un usuario para acceder a esta máquina." + +#: ../plugins/vnc/vinagre-vnc-tab.c:594 +msgid "A password is required in order to access this machine." +msgstr "Se necesita una contraseña para acceder a esta máquina." + +#: ../plugins/vnc/vinagre-vnc-tab.c:645 +msgid "S_caling" +msgstr "Es_calado" + +#: ../plugins/vnc/vinagre-vnc-tab.c:646 +msgid "Fits the remote screen into the current window size" +msgstr "Ajustar la pantalla remota en el tamaño actual de ventana" + +#: ../plugins/vnc/vinagre-vnc-tab.c:661 +msgid "Does not send mouse and keyboard events" +msgstr "No enviar eventos del teclado y del ratón" + +#: ../plugins/vnc/vinagre-vnc-tab.c:674 +msgid "_Original size" +msgstr "Tamaño _original" + +#: ../plugins/vnc/vinagre-vnc-tab.c:675 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Ajustar la ventana al tamaño del escritorio remoto" + +#: ../plugins/vnc/vinagre-vnc-tab.c:698 ../plugins/vnc/vinagre-vnc-tab.c:772 +#: ../plugins/vnc/vinagre-vnc-tab.c:773 +msgid "Send Ctrl-Alt-Del" +msgstr "Enviar Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:699 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Enviar Ctrl+Alt+Del al equipo remoto" + +#: ../plugins/vnc/vinagre-vnc-tab.c:751 ../plugins/vnc/vinagre-vnc-tab.c:752 +msgid "Scaling" +msgstr "Escalado" + +#: ../plugins/vnc/vinagre-vnc-tab.c:761 ../plugins/vnc/vinagre-vnc-tab.c:762 +msgid "Read only" +msgstr "Sólo lectura" + +#: ../plugins/vnc/vinagre-vnc-tab.c:931 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"No se soporta el escalado en esta instalación.\n" +"\n" +"Lea el archivo README (empaquetado con Vinagre) para saber cómo activar esta " +"característica." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Soporte para VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Un menú para acceder rápidamente a una máquina remota" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Factoría de miniaplicaciones de Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "No se pudo ejecutar vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Abrir el visor de escritorios remotos" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Acceder a sus marcadores" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "El protocolo %s no está soportado." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Error al inicializar los marcadores: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:273 msgid "Unknown error" msgstr "Error desconocido" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Error al inicializar los marcadores: El archivo parece estar vacío" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Error al inicializar los marcadores: El archivo no es un archivo de " "marcadores de Vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Error al guardar los marcadores: Falló al crear la estructura XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "Error al guardar los marcadores: Falló al inicializar la estructura XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Error al guardar los marcadores: Falló al finalizar la estructura XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Error al guardar los marcadores: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Error al migrar los marcadores: Falló al crear la estructura XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Error al migrar los marcadores: Falló al inicializar la estructura XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Error al migrar los marcadores: Falló al finalizar la estructura XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Error al migrar los marcadores: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" +"Error al migrar los marcadores: El complemento para VNC no está activado" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Falló al crear el directorio" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -295,462 +491,503 @@ "Migrando el archivo de marcadores al nuevo formato. Se supone que esta " "operación sólo se ejecuta una vez." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Error al abrir el archivo de los marcadores antiguos: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migración cancelada" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "No se pudo eliminar el archivo de marcadores antiguo" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Carpeta padre" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Nombre no válido para esta carpeta" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." msgstr "" "El nombre «%s» ya se está usando en esta carpeta. Use un nombre distinto." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Nombre no válido para este elemento" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "¿Está seguro de que quiere quitar %s de los marcadores?" +msgid "(Protocol: %s)" +msgstr "(Protocolo: %s)" -#: ../src/vinagre-bookmarks-ui.c:297 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "¿Está seguro de que quiere quitar %s de los marcadores?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "¿Eliminar carpeta?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Note que también se eliminarán todas sus subcarpetas y elementos." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "¿Eliminar elemento?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Error al eliminar el marcador: No se encontró la entrada" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Carpeta nueva" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Elegir el archivo" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Formatos soportados" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "No existe ningún archivo soportado" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +" Ninguno de los complementos activos ofrece soporte para el archivo que " +"abrir. Active más complementos e inténtelo de nuevo." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "No se pudo abrir el siguiente archivo:" msgstr[1] "No se pudieron abrir los siguientes archivos:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "No se pudo obtener el protocolo activo en la lista de protocolos." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Error al guardar el archivo de histórico: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Elija un servidor VNC" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Elegir un escritorio remoto" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "El protocolo %s no está soportado." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "No se pudo abrir el archivo." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "No se pudo analizar el archivo." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Valor incorrecto para la opción «compartida»: %d. Se supone que debería ser 0 " -"ó 1. Ignorándola." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "No se pudo encontrar la dirección del equipo en el archivo." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Ninguno de los complementos reconoció el archivo" -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Operación no válida" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Los datos recibidos de la operación arrastrar y soltar no son válidos." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Equipos cercanos" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Abre un archivo .vnc" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "nombre de archivo" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Abrir Vinagre en modo a pantalla completa" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "" "Crear una ventana de nivel superior nueva en una instancia existente de " "Vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Abrir un archivo reconocido por Vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "nombre de archivo" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[servidor:puerto]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Ha ocurrido el siguiente error:" msgstr[1] "Han ocurrido los siguientes errores:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr " - Cliente VNC para GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Visor de escritorios remotos" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Ejecute «vinagre --help» para ver una lista completa de las opciones " "disponibles para la línea de comandos" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Falló al resolver el nombre del equipo avahi: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "El complemento %s ya ha registrado un examinador para el servicio %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Falló al añadir el examinador mDNS para el servicio %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Falló al examinar los equipos: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 #, c-format -msgid "Connection to host %s was closed." -msgstr "Se cerró la conexión con el equipo %s." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Falló al examinar el examinador mDNS: %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "Se cerró la conexión con el equipo %s." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Conexión cerrada" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "La autenticación contra el equipo %s ha fallado" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Falló la autenticación" + +#: ../vinagre/vinagre-notebook.c:526 msgid "Connecting..." msgstr "Conectando…" -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:553 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Cerrar la conexión" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Gestor de complementos" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Complemento" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Activado" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "C_onfigurar" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ctivar" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ac_tivar todos" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Desactivar todos" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "Acerca _del complemento" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "C_onfigurar el complemento" + +#: ../vinagre/vinagre-prefs.c:229 msgid "Cannot initialize preferences manager." msgstr "No se pudo inicializar el gestor de preferencias." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Error al conectar con el equipo." +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Abandonar pantalla completa" -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "La autenticación contra el equipo %s ha fallado" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Falló la autenticación" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "" -"El método de autenticación contra el equipo %s no está soportado. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "No se soporta la autenticación" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Error al guardar la conexión reciente." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Error al guardar las credenciales en el depósito de claves." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Error de autenticación" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Se necesita un usuario para acceder a esta máquina." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Se necesita una contraseña para acceder a esta máquina." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimizar ventana" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Escalado" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "No se pudo obtener una captura de la conexión." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Sólo lectura" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Guardar la captura de pantalla" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Capturar pantalla" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Captura de pantalla de %s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Enviar Ctrl-Alt-Del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Error al guardar la captura de pantalla" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Nombre del escritorio:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Imposible obtener la propiedad del servicio: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Puerto:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "No se puede crear la conexión: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensiones:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "No se puede aceptar el tubo de flujo: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "No se pudo obtener una captura de la conexión." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "No se puede obtener el nombre de contacto: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "Captura de pantalla de %s" +msgid "Impossible to get the avatar: %s" +msgstr "No se puede obtener el avatar: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Guardar la captura de pantalla" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s quiere compartir su escritorio con usted." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"No se soporta el escalado en esta instalación.\n" -"\n" -"Lea el archivo README (empaquetado con Vinagre) para saber cómo activar esta " -"característica." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Invitación para compartir el escritorio" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "Máq_uina" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Editar" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Ver" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Conectar con una máquina remota" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Abrir un archivo .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Salir del programa" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Editar las preferencias de la aplicación" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Abrir marcador" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Conectar con esta máquina" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Editar marcador" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Editar los detalles del marcador seleccionado" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Quitar de los marcadores" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Eliminar la conexión actualmente seleccionada de los marcadores" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "Carpeta _nueva" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Crear una carpeta nueva" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "Índ_ice" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Abrir el manual de vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Acerca de esta aplicación" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Barra de _herramientas" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Mostrar u ocultar la barra de herramientas" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Barra de _estado" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Mostrar u ocultar la barra de estado" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Panel lateral" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Mostrar u ocultar el panel lateral" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Cerrar la conexión actual" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "Cerrar _todo" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Cierra todas las conexiones activas" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Añadir marcador" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Añadir la conexión actual a los marcadores" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Capturar pantalla" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Toma una captura de pantalla de la conexión activa" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Enviar Ctrl+Alt+Del a la conexión activa" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Ver la máquina actual a pantalla completa" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Tamaño _original" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Ajustar la ventana al tamaño del escritorio remoto" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "Es_calado" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Ajustar la pantalla remota en el tamaño actual de ventana" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "Sólo _lectura" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Desactivar el teclado y el ratón" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Barra de _herramientas" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Mostrar u ocultar la barra de herramientas" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Barra de e_stado" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Mostrar u ocultar la barra de estado" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_Panel lateral" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Mostrar u ocultar el panel lateral" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Ocurrió un error:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre es un cliente VNC para el escritorio GNOME" +#: ../vinagre/vinagre-utils.c:175 +msgid "" +"A plugin tried to open an UI file but did not succeed, with the error " +"message:" +msgstr "" +"Un complemento intentó abrir un archivo de IU pero no lo consiguió, el " +"mensaje de error fue:" + +#: ../vinagre/vinagre-utils.c:177 +msgid "" +"The program tried to open an UI file but did not succeed, with the error " +"message:" +msgstr "" +"El programa intentó abrir un archivo de IU pero no lo consiguió, el mensaje " +"de error fue:" + +#: ../vinagre/vinagre-utils.c:180 +msgid "Please check your installation." +msgstr "Compruebe su instalación." + +#: ../vinagre/vinagre-utils.c:181 +#| msgid "Error while saving history file: %s" +msgid "Error loading UI file" +msgstr "Error al cargar el archivo de IU" + +#: ../vinagre/vinagre-utils.c:486 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre es un visor de escritorios remotos para el Escritorio GNOME" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:489 msgid "" "Vinagre 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 " @@ -762,7 +999,7 @@ "Free Sofware Foundation; tanto en la versión 2 de la Licencia o (a su " "elección) cualquier versión posterior." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:493 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -774,7 +1011,7 @@ "CUALQUIER PROPÓSITO PARTICULAR. Para obtener más detalles consulte la " "Licencia Pública General GNU." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:497 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -782,32 +1019,79 @@ "Debería haber recibido una copia de la Licencia Pública General GNU junto " "con este programa. Si no la recibió, consulte ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:519 msgid "translator-credits" msgstr "Jorge González , 2007-2008" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:522 msgid "Vinagre Website" msgstr "Página web de Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:404 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "No se pudo mezclar vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:432 msgid "_Recent connections" msgstr "Conexiones _recientes" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:592 #, c-format msgid "Open %s:%d" msgstr "Abrir %s: %d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Pulse Ctrl+Alt para liberar el cursor" +#~ msgid "Failed to request name: %s" +#~ msgstr "Falló al consultar el nombre: %s" + +#~ msgid "No error given" +#~ msgstr "No se proporcionó ningún error" + +#~ msgid "Could not load builder file: %s" +#~ msgstr "No se pudo cargar el archivo constructor: %s" + +#~ msgid "Minimize window" +#~ msgstr "Minimizar ventana" + +#~ msgid "_Plugins" +#~ msgstr "Co_mplementos" + +#~ msgid "Select plugins" +#~ msgstr "Seleccionar complementos" + +#~ msgid "Supported formats" +#~ msgstr "Formatos soportados" + +#~ msgid "Connection" +#~ msgstr "Conexión" + +#~ msgid "Folder" +#~ msgstr "Carpeta" + +#~ msgid "host or host:display or host::port" +#~ msgstr "equipo o equipo:pantalla o equipo::puerto" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Elija un servidor VNC" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "No se pudo encontrar la dirección del equipo en el archivo." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Abre un archivo .vnc" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr " - Cliente VNC para GNOME" + +#~ msgid "Error saving the credential on the keyring." +#~ msgstr "Error al guardar las credenciales en el depósito de claves." + +#~ msgid "_Read only" +#~ msgstr "Sólo _lectura" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Pulse Ctrl+Alt para liberar el cursor" #~ msgid "gtk-close" #~ msgstr "gtk-close" diff -Nru vinagre-2.26.1/po/et.po vinagre-2.29.1/po/et.po --- vinagre-2.26.1/po/et.po 2009-04-04 12:06:52.000000000 +0100 +++ vinagre-2.29.1/po/et.po 2009-10-24 13:56:52.000000000 +0100 @@ -6,16 +6,16 @@ # # Ivar Smolin , 2008, 2009. # Mattias Põldaru , 2008, 2009. -# Priit Laes , 2008. +# Priit Laes , 2008, 2009. # msgid "" msgstr "" -"Project-Id-Version: vinagre HEAD\n" +"Project-Id-Version: vinagre MASTER\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-20 20:31+0000\n" -"PO-Revision-Date: 2009-03-26 18:32+0300\n" -"Last-Translator: Mattias Põldaru \n" +"POT-Creation-Date: 2009-10-09 06:59+0000\n" +"PO-Revision-Date: 2009-10-09 14:31+0300\n" +"Last-Translator: Ivar Smolin \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,48 +34,41 @@ msgid "Remote Desktop Viewer" msgstr "Kaugtöölaudade vaataja" -msgid "Authentication is required" -msgstr "Autentimine on vajalik" +msgid "All fields above are mandatory" +msgstr "Kõik ülemised väljad on kohustuslikud" -msgid "Connection options" -msgstr "Ühenduse valikud" +msgid "Authentication is required" +msgstr "Autentimine on vajalik" -msgid "Connection" -msgstr "Ühendus" +msgid "Bookmarks" +msgstr "Järjehoidjad" -msgid "Folder" -msgstr "Kataloog" +msgid "Connection" +msgstr "Ühendus" -msgid "Interface" -msgstr "Kasutajakeskkond" +msgid "Connection options" +msgstr "Ühenduse valikud" -msgid "Options" -msgstr "Valikud" +msgid "Folder" +msgstr "Kaus" -msgid "Parent Folder" -msgstr "Ülemine kataloog" +msgid "Host:" +msgstr "Host:" -msgid "Which machine do you want to connect to?" -msgstr "Millise masinaga soovid ühendust võtta?" +msgid "Interface" +msgstr "Kasutajakeskkond" -msgid "All fields above are mandatory" -msgstr "Kõik ülemised väljad on kohustuslikud." +msgid "Options" +msgstr "Valikud" -msgid "Bookmarks" -msgstr "Järjehoidjad" - -msgid "Host:" -msgstr "Host:" +msgid "Parent Folder" +msgstr "Ülemine kataloog" msgid "Preferences" msgstr "Eelistused" -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "Kas ainult ühe aktiivse ühenduse korral näidatakse sakke või mitte" - -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Kas näidata menüüdes kiirklahve või mitte" +msgid "Which machine do you want to connect to?" +msgstr "Millise masinaga soovid ühendust võtta?" msgid "_Always show tabs" msgstr "_Alati näidatakse sakke" @@ -96,24 +89,28 @@ msgid "_Password:" msgstr "_Parool:" +msgid "_Protocol:" +msgstr "_Protokoll:" + msgid "_Remember this credential" msgstr "See _tõend jäetakse meelde" -msgid "_Scaling" -msgstr "_Skaleerimine" - msgid "_Show menu shortcuts" msgstr "_Menüüs näidatakse kiirklahve" msgid "_Username:" msgstr "_Kasutajanimi:" -msgid "_View only" -msgstr "_Kirjutuskaitsega" +msgid "Active plugins" +msgstr "Aktiivsed pluginad" -#. Tooltip for host entry in connect dialog -msgid "host or host:display or host::port" -msgstr "host või host:kuva või host::port" +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Aktiivsete pluginate loend. See sisaldab aktiivsete pluginate \"asukohta\". " +"Konkreetse plugina \"asukoha\" leiad .vinagre-plugin failist." msgid "Maximum number of history items in connect dialog" msgstr "Ühendusdialoogi ajalookirjete suurim hulk" @@ -153,12 +150,154 @@ msgid "Whether we should leave other clients connected" msgstr "Kas teised kliendid tuleb jätta ühendatuks või mitte" +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Kas ainult ühe aktiivse ühenduse korral näidatakse sakke või mitte" + +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Kas näidata menüüdes kiirklahve või mitte" + msgid "Remote Desktop (VNC) file" msgstr "Kaugtöölaua (VNC) fail" msgid "Remote Desktop Connection" msgstr "Kaugtöölaua ühendus" +#. vim: set ts=8: +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +msgid "Access Unix/Linux terminals" +msgstr "Ligipääs Unixi/Linuxi terminalidele" + +msgid "Port:" +msgstr "Port:" + +msgid "SSH support" +msgstr "SSH tugi" + +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +" 'shared' lipul on sobimatu väärtus: %d. See peaks olema 0 või 1. Lippu " +"eiratakse." + +msgid "_Reverse Connections..." +msgstr "" + +msgid "Configure incoming VNC connections" +msgstr "Sisenevate VNC-ühenduste seadistamine" + +#. Translators: this is a command line option (run vinagre --help) +msgid "Enable scaled mode" +msgstr "Luba skaleeritud režiim" + +#. Translators: this is a command line option (run vinagre --help) +msgid "VNC Options:" +msgstr "VNC valikud:" + +#. Translators: this is a command line option (run vinagre --help) +msgid "Show VNC Options" +msgstr "Kuva VNC valikud" + +#. vim: set ts=8: +msgid "VNC" +msgstr "VNC" + +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Ligipääs Unixi/Linuxi, Windowsi ja teiste opsüsteemidega masinatele." + +msgid "Could not parse the file." +msgstr "Faili pole võimalik töödelda." + +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "See pole VNC fail: puudub grupp \"connection\"." + +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "See pole VNC fail: puudub võti \"host\"." + +msgid "VNC Options" +msgstr "VNC Valikud" + +msgid "_View only" +msgstr "_Kirjutuskaitsega" + +msgid "_Scaling" +msgstr "_Skaleerimine" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +msgid "VNC Files" +msgstr "VNC failid" + +msgid "Desktop Name:" +msgstr "Töölaua nimi:" + +msgid "Dimensions:" +msgstr "Mõõtmed:" + +msgid "Error connecting to host." +msgstr "Viga hostiga ühendumisel." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Hosti %s autentimismeetod pole toetatud. (%u)" + +msgid "Authentication unsupported" +msgstr "Toetamata autentimismeetod" + +msgid "Authentication error" +msgstr "Viga autentimisel" + +msgid "A username is required in order to access this machine." +msgstr "Ligipääsuks sellele masinale on vaja kasutajanime." + +msgid "A password is required in order to access this machine." +msgstr "Sellele masinale ligipääsuks on vaja parooli." + +msgid "S_caling" +msgstr "_Skaleerimine" + +msgid "Fits the remote screen into the current window size" +msgstr "Kaugekraani sobitamine käesolevasse aknasse" + +msgid "Does not send mouse and keyboard events" +msgstr "Hiire- ja klaviatuurisündmuseid ei saadeta" + +msgid "_Original size" +msgstr "_Algne suurus" + +msgid "Adjusts the window to the remote desktop's size" +msgstr "Akna suurus sobitatakse kaugtöölaua suurusega" + +msgid "Send Ctrl-Alt-Del" +msgstr "Saada Ctrl+Alt+Del" + +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Kaugmasinale Ctrl+Alt+Del saatmine" + +msgid "Scaling" +msgstr "Skaleerimine" + +msgid "Read only" +msgstr "Kirjutuskaitsega" + +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Selles paigalduses ei ole skaleerimine toetatud.\n" +"\n" +"Selle võimaluse sisselülitamist on kirjeldatud README failis (tuleb " +"Vinagre'ga kaasa)." + +msgid "VNC support" +msgstr "VNC tugi" + msgid "A menu to quickly access remote machines" msgstr "Kaugmasinaga kiirelt ühenduse võtmise menüü" @@ -175,6 +314,10 @@ msgstr "Ligipääs järjehoidjatele" #, c-format +msgid "The protocol %s is not supported." +msgstr "%s-protokoll pole toetatud." + +#, c-format msgid "Error while initializing bookmarks: %s" msgstr "Viga järjehoidjate lähtestamisel: %s" @@ -216,6 +359,9 @@ msgid "Error while migrating bookmarks: %s" msgstr "Viga järjehoidjate vormingu uuendamisel: %s" +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Viga järjehoidjate migreerimisel: VNC plugin pole aktiveeritud" + msgid "Failed to create the directory" msgstr "Kausta loomine nurjus" @@ -247,13 +393,18 @@ "The name \"%s\" is already used in this folder. Please use a different name." msgstr "Nime \"%s\" on selles kaustas juba kasutatud. Vali muu nimi." -#| msgid "Invalid name for this folder" msgid "Invalid name for this item" msgstr "Kirje nimi on sobimatu" +#. Translators: %s is a protocol name, like VNC or SSH #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Kas eemaldada %s järjehoidjate hulgast?" +msgid "(Protocol: %s)" +msgstr "(Protokoll: %s)" + +#. Translators: %s is a bookmark entry name +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Kas eemaldada %s järjehoidjate hulgast?" msgid "Remove Folder?" msgstr "Kas kaust eemaldada?" @@ -273,40 +424,36 @@ msgid "Choose the file" msgstr "Faili valimine" -msgid "Supported formats" -msgstr "Toetatud vormingud" +msgid "There are none supported files" +msgstr "Pole ühtegi toetatud faili" + +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Mitte ükski aktiivsetest pluginatest ei paku toetatud faili avamist. " +"Aktiveeri veel pluginaid ja proovi uuesti." msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Järgnevat faili pole võimalik avada:" msgstr[1] "Järgnevaid faile pole võimalik avada:" +msgid "Could not get the active protocol in the protocol list." +msgstr "Protokolliloendist ei saadud aktiivset protokolli." + #, c-format msgid "Error while saving history file: %s" msgstr "Viga ajaloofaili salvestamisel: %s" -msgid "Choose a VNC Server" -msgstr "VNC-serveri valimine" - -#, c-format -msgid "The protocol %s is not supported." -msgstr "%s-protokoll pole toetatud." +msgid "Choose a Remote Desktop" +msgstr "Kaugtöölaua valimine" msgid "Could not open the file." msgstr "Faili pole võimalik avada." -msgid "Could not parse the file." -msgstr "Faili pole võimalik töödelda." - -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -" 'shared' lipul on sobimatu väärtus: %d. See peaks olema 0 või 1. Lippu " -"eiratakse." - -msgid "Could not find the host address in the file." -msgstr "Failist ei leitud hosti aadressi." +msgid "The file was not recognized by any of the plugins." +msgstr "Ükski pluginatest ei tundnud seda faili ära." msgid "Invalid operation" msgstr "Sobimatu tegevus" @@ -317,15 +464,22 @@ msgid "Hosts nearby" msgstr "Lähedalasuvad hostid" -msgid "Opens a .vnc file" -msgstr ".vnc faili avamine" - -msgid "filename" -msgstr "failinimi" +#. Translators: this is a command line option (run vinagre --help) +msgid "Open vinagre in fullscreen mode" +msgstr "Vinagre avamine täisekraanirežiimis" +#. Translators: this is a command line option (run vinagre --help) msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Olemasolevale vinagre instantsile uue ülataseme akna loomine" +#. Translators: this is a command line option (run vinagre --help) +msgid "Open a file recognized by vinagre" +msgstr "Vinagrele tuntud vormingus faili avamine" + +msgid "filename" +msgstr "failinimi" + +#. Translators: this is a command line option (run vinagre --help) msgid "[server:port]" msgstr "[server:port]" @@ -335,8 +489,8 @@ msgstr[1] "Leidsid aset järgmised vead:" #. Setup command line options -msgid "- VNC Client for GNOME" -msgstr " - VNC klient GNOME jaoks" +msgid "- Remote Desktop Viewer" +msgstr "- Kaugtöölaudade vaataja" msgid "" "Run 'vinagre --help' to see a full list of available command line options" @@ -347,102 +501,121 @@ msgstr "Tõrge avahi hostinime lahendamisel: %s\n" #, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Plugin %s on juba registreerinud teenuse %s jaoks lehitseja." + +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Tõrge mDNS-i sirvija lisamisel teenusele %s." + +#, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Tõrge hostide sirvimisel: %s\n" #, c-format -msgid "Connection to host %s was closed." -msgstr "Ühendus hostiga %s suleti." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Tõrge mDNS-i sirvija lähtestamisel: %s\n" + +#. Translators: %s is a host name or IP address. +#, c-format +msgid "Connection to host %s was closed." +msgstr "Ühendus hostiga %s suleti." msgid "Connection closed" msgstr "Ühendus suleti" +#. Translators: %s is a host name or IP address. +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Autentimine hostile %s nurjus" + +msgid "Authentication failed" +msgstr "Autentimine nurjus" + msgid "Connecting..." msgstr "Ühendumine..." msgid "Close connection" msgstr "Ühenduse sulgemine" -msgid "Cannot initialize preferences manager." -msgstr "Eelistuste haldurit pole võimalik lähtestada." +msgid "Plugin Manager" +msgstr "Pluginahaldur" -msgid "Error connecting to host." -msgstr "Viga hostiga ühendumisel." +msgid "Plugin" +msgstr "Plugin" -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Autentimine hostile \"%s\" nurjus" +msgid "Enabled" +msgstr "Lubatud" -msgid "Authentication failed" -msgstr "Autentimine nurjus" +msgid "C_onfigure" +msgstr "_Seadista" -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Host %s ei toeta kasutatud autentimismeetodit. (%u)" +msgid "A_ctivate" +msgstr "_Aktiveeri" -msgid "Authentication unsupported" -msgstr "Toetamata autentimismeetod" +msgid "Ac_tivate All" +msgstr "Aktiveeri _kõik" -msgid "Error saving recent connection." -msgstr "Viga hiljutise ühenduse salvestamisel." +msgid "_Deactivate All" +msgstr "_Deaktiveeri kõik" -msgid "Error saving the credential on the keyring." -msgstr "Viga tõendite salvestamisel võtmerõngasse." +msgid "_About Plugin" +msgstr "_Pluginast lähemalt" -msgid "Authentication error" -msgstr "Viga autentimisel" +msgid "C_onfigure Plugin" +msgstr "_Seadista pluginat" -msgid "A username is required in order to access this machine." -msgstr "Ligipääsuks sellele masinale on vaja kasutajanime." +msgid "Cannot initialize preferences manager." +msgstr "Eelistuste haldurit pole võimalik lähtestada." -msgid "A password is required in order to access this machine." -msgstr "Sellele masinale ligipääsuks on vaja parooli." +msgid "Leave fullscreen" +msgstr "Välju täisekraanvaatest" -msgid "Minimize window" -msgstr "Minimeeri aken" +msgid "Error saving recent connection." +msgstr "Viga hiljutise ühenduse salvestamisel." -msgid "Scaling" -msgstr "Skaleerimine" +msgid "Error saving the credentials on the keyring." +msgstr "Viga tõendite salvestamisel võtmerõngasse." -msgid "Read only" -msgstr "Kirjutuskaitsega" +msgid "Could not get a screenshot of the connection." +msgstr "Ühendusest pole võimalik kuvatõmmist võtta." -#. Machine menu -msgid "Take screenshot" -msgstr "Võta ekraanitõmmis" +msgid "Save Screenshot" +msgstr "Kuvatõmmise salvestamine" -msgid "Send Ctrl-Alt-Del" -msgstr "Saada Ctrl+Alt+Del" +#, c-format +msgid "Screenshot of %s" +msgstr "Masina %s kuvatõmmis" -msgid "Desktop Name:" -msgstr "Töölaua nimi:" +msgid "Error saving screenshot" +msgstr "Viga kuvatõmmise salvestamisel" -msgid "Port:" -msgstr "Port:" +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Teenuse omadust pole võimalik hankida: %s" -msgid "Dimensions:" -msgstr "Mõõtmed:" +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Ühendust pole võimalik luua: %s" -msgid "Could not get a screenshot of the connection." -msgstr "Ühendusest pole võimalik ekraanitõmmist võtta." +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Andmevoo toruga pole võimalik nõustuda: %s" #, c-format -msgid "Screenshot of %s" -msgstr "Masina %s ekraanitõmmis" +msgid "Impossible to get the contact name: %s" +msgstr "Kontaktnime pole võimalik hankida: %s" -msgid "Save Screenshot" -msgstr "Ekraanitõmmise salvestamine" +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Avatari pole võimalik hankida: %s" -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Selles paigalduses ei ole skaleerimine toetatud.\n" -"\n" -"Selle võimaluse sisselülitamist on kirjeldatud README failis (tuleb " -"Vinagre'ga kaasa)." +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s soovib oma töölauda sinuga jagada." + +msgid "Desktop sharing invitation" +msgstr "Töölaua jagamise kutse" #. Toplevel msgid "_Machine" @@ -469,6 +642,10 @@ msgid "Edit the application preferences" msgstr "Redigeeri rakenduse eelistusi" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu msgid "_Open bookmark" msgstr "_Ava järjehoidja" @@ -504,6 +681,24 @@ msgid "About this application" msgstr "Sellest rakendusest lähemalt" +msgid "_Toolbar" +msgstr "_Tööriistariba" + +msgid "Show or hide the toolbar" +msgstr "Tööriistariba näitamine või peitmine" + +msgid "_Statusbar" +msgstr "_Olekuriba" + +msgid "Show or hide the statusbar" +msgstr "Olekuriba näitamine või peitmine" + +msgid "Side _Panel" +msgstr "Külg_paneel" + +msgid "Show or hide the side panel" +msgstr "Külgpaneeli näitamine või peitmine" + msgid "Close the current connection" msgstr "Käesoleva ühenduse sulgemine" @@ -520,56 +715,39 @@ msgid "Add current connection to your bookmarks" msgstr "Käesoleva ühenduse lisamine järjehoidjate hulka" -msgid "Take a screenshot of active connection" -msgstr "Aktiivsest ühendusest ekraanitõmmise võtmine" +#. Machine menu +msgid "Take screenshot" +msgstr "Võta kuvatõmmis" -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Kõigile aktiivsetele ühendustele Ctrl+Alt+Del saatmine" +msgid "Take a screenshot of active connection" +msgstr "Aktiivsest ühendusest kuvatõmmise võtmine" msgid "View the current machine in full screen" msgstr "Käesoleva masina vaatamine täisekraanil" -msgid "_Original size" -msgstr "_Algne suurus" - -msgid "Adjusts the window to the remote desktop's size" -msgstr "Akna suurus sobitatakse kaugtöölaua suurusega" - -msgid "S_caling" -msgstr "_Skaleerimine" - -msgid "Fit the remote screen into the current window size" -msgstr "Kaugekraani sobitamine käesolevasse aknasse" - -msgid "_Read only" -msgstr "_Kirjutuskaitsega" - -msgid "Disable mouse and keyboard" -msgstr "Hiire ja klaviatuuri keelamine" - -msgid "_Toolbar" -msgstr "_Tööriistariba" - -msgid "Show or hide the toolbar" -msgstr "Tööriistariba näitamine või peitmine" - -msgid "_Statusbar" -msgstr "_Olekuriba" +msgid "An error has occurred:" +msgstr "Esines järgmine viga:" -msgid "Show or hide the statusbar" -msgstr "Olekuriba näitamine või peitmine" +msgid "" +"A plugin tried to open an UI file but did not succeed, with the error " +"message:" +msgstr "" +"Plugin proovis kasutajaliidese faili avada, kuid see tegevus lõppes veaga: " -msgid "Side _Panel" -msgstr "Külg_paneel" +msgid "" +"The program tried to open an UI file but did not succeed, with the error " +"message:" +msgstr "" +"Programm proovis kasutajaliidese faili avada, kuid see tegevus lõppes veaga: " -msgid "Show or hide the side panel" -msgstr "Külgpaneeli näitamine või peitmine" +msgid "Please check your installation." +msgstr "Palun kontrolli programmi paigaldust." -msgid "An error has occurred:" -msgstr "Esines järgmine viga:" +msgid "Error loading UI file" +msgstr "Viga kasutajaliidese faili laadimisel" -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre on GNOME töölaua VNC-klient" +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre on kaugtöölaudade vaataja GNOME töölauale" msgid "" "Vinagre is free software; you can redistribute it and/or modify it under the " @@ -602,9 +780,9 @@ msgid "translator-credits" msgstr "" -"Ivar Smolin , 2008.\n" -"Mattias Põldaru , 2008, 2009.\n" -"Priit Laes , 2008, 2009." +"Ivar Smolin , 2008, 2009.\n" +"Mattias Põldaru , 2008, 2009.\n" +"Priit Laes , 2008, 2009." msgid "Vinagre Website" msgstr "Vinagre veebisait" @@ -620,41 +798,3 @@ #, c-format msgid "Open %s:%d" msgstr "%s:%d avamine" - -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Kursori vabastamiseks vajuta Ctrl+Alt" - -#~ msgid "Editing a bookmark" -#~ msgstr "Järjehoidja redigeerimine" - -#~ msgid "Enter a name for this connection" -#~ msgstr "Sisesta sellele ühendusele nimi" - -#~ msgid "Editing a bookmark" -#~ msgstr "Järjehoidja redigeerimine" - -#~ msgid "Saving to bookmarks" -#~ msgstr "Järjehoidjatesse salvestamine" - -#~ msgid "_Bookmark name:" -#~ msgstr "_Järjehoidja nimi:" - -#~ msgid "Confirm removal?" -#~ msgstr "Eemaldamise kinnitus" - -#~ msgid "Error while removing %s from bookmarks: %s" -#~ msgstr "Viga %s eemaldamisel järjehoidjate seast: %s" - -#~ msgid "" -#~ "Scaling does not work properly on composited windows. Disable the visual " -#~ "effects and try again." -#~ msgstr "" -#~ "Skaleerimine ei tööta komposiitakendes õigesti. Keela kuvaefektid ja " -#~ "proovi uuesti." - -#~ msgid "" -#~ "In order to connect on this machine, a password is required. Please " -#~ "supply it." -#~ msgstr "" -#~ "Selle masinaga ühenduse loomiseks on vaja parooli. Palun sisesta see." diff -Nru vinagre-2.26.1/po/eu.po vinagre-2.29.1/po/eu.po --- vinagre-2.26.1/po/eu.po 2009-03-26 18:20:03.000000000 +0000 +++ vinagre-2.29.1/po/eu.po 2009-08-28 17:21:05.000000000 +0100 @@ -7,21 +7,21 @@ msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-23 13:24+0100\n" -"PO-Revision-Date: 2009-03-23 13:25+0100\n" +"POT-Creation-Date: 2009-08-27 18:36+0200\n" +"PO-Revision-Date: 2009-08-27 18:51+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "Honi _buruz" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Laguntza" @@ -30,123 +30,120 @@ msgstr "Sarbidetu urruneko mahaigainetara" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Urruneko mahaigainen ikustailea" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Autentifikatu egin behar da" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Konexioaren aukerak" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Konexioa" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Karpeta" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interfazea" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Aukerak" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Karpeta gurasoa" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Zein ordenagailurekin konektatzea nahi duzu?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Gaineko eremu guztiak derrigorrezkoak dira" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Gaineko eremu guztiak derrigorrezkoak dira" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Autentifikatu egin behar da" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Laster-markak" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Konexioa" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Konexioaren aukerak" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Karpeta" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Ostalaria:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interfazea" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Aukerak" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Karpeta gurasoa" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Hobespenak" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "Fitxatek erakutsi behar diren ala ez (nahiz eta konexio aktibo bakarra egon)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Zein ordenagailurekin konektatzea nahi duzu?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Menuaren bizkortzaileak (laster-teklak) erakutsi behar diren ala ez" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Beti erakutsi fitxak" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Autentifikatu" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Pantaila osoa" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Ostalaria:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Izena:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Pasahitza:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokoloa:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Gogoratu kredentzial hau" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Eskalatzea" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Erakutsi menuko lasterbideak" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Erabiltzaile-izena:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Ikusteko soilik" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Plugin aktiboak" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "ostalaria edo ostalaria:pantaila edo ostalaria:ataka" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Plugin aktiboen zerrenda. Plugin aktiboen \"kokalekua\" dauka. Ikus " +".vinagre-plugin fitxategia plugin baten \"kokalekua\" (location) lortzeko." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Historiako elementuen gehienezko kopurua konexioaren elkarrizketa-koadroan" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -156,7 +153,7 @@ "\"true\" (egia) gisa gaitzeko. Jakin ezazu gaituta badaude, menuak jasoko " "dituela tekla horiek eta ez direla urruneko ostalarira bidaliko." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -165,17 +162,17 @@ "\" (faltsua) gisa konexio aktibo bat baino gehiago daudenean soilik fitxak " "erakusteko." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Elementuen gehienezko kopurua zehazten du ostalariaren goitibeherako " "zerrendan." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" URLen kudeatzailea" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -185,10 +182,18 @@ "bezeroak konektatuta uzteko, edo dauden konexioak jaregiteko. Ezarri balioa " "\"true\" (egia) gisa mahaigaina beste bezeroekin partekatzeko." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Beste bezeroak konektatuta utzi behar diren ala ez" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "Fitxatek erakutsi behar diren ala ez (nahiz eta konexio aktibo bakarra egon)" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Menuaren bizkortzaileak (laster-teklak) erakutsi behar diren ala ez" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Urruneko mahaigainaren (VNC) fitxategia" @@ -197,91 +202,270 @@ msgid "Remote Desktop Connection" msgstr "Urruneko mahaigainaren konexioa" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Sarbidetu Unix/Linux terminaletan" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Ataka:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH euskarria" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Okerreko balioa 'partekatua' banderarentzako: %d. 0 edo 1 izan behar duela " +"suposatzen da. Ez ikusi egiten." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Gaitu modu eskalatua" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC aukerak:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Erakutsi VNC aukerak" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Sarbidetu Unix/Linux, Windows eta beste ordenagailuetara." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Ezin izan da fitxategia analizatu." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Fitxategia ez da VNC bat. \"connection\" (konexioa) taldea falta zaio." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Fitxategia ez da VNC bat. \"host\" (ostalaria) gakoa falta zaio." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC aukerak" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Ikusteko soilik" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Eskalatzea" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC fitxategiak" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Mahaigainaren izena:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimentsioak:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Errorea ostalariarekin konektatzean" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "%s ostalariaren autentifikazio-metodoa ez dago onartuta. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Autentifikazioa ez dago onartuta" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Errorea autentifikatzean" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Erabiltzaile-izena behar da ordenagailu honetara sarbidetzeko." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Pasahitza behar da ordenagailu honetara sarbidetzeko." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "E_skalatzea" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Doitu urruneko pantaila uneko leihoaren tamainara" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Ez bidali sagu eta teklatuaren gertaerarik" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Jatorrizko tamaina" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Leihoa doitzen du urruneko mahaigainaren tamainara" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Bidali Ktrl+Alt+Ezab" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Bidali Ktrl+Alt+Ezab urruneko ordenagailura" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Eskalatzea" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Irakurtzeko soilik" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Eskalatzea ez dago onartuta instalazio honetan.\n" +"\n" +"Irakurri README fitxategia (Vinagre-rekin batera datorrena) eginbide hau " +"nola gaitzen den jakiteko." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC euskarria" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Menua urruneko ordenagailuetan azkar sarbidetzeko" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre miniaplikazioaren fabrika" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Ezin izan da vinagre exekutatu:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Ireki urruneko mahaigainen ikustailea" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Atzitu zure laster-markak" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "%s protokoloa ez dago onartuta." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Errorea laster-markak hasieratzean: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Errore ezezaguna" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Errorea laster-markak hasieratzean: fitxategia hutsik dagoela dirudi" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Errorea laster-markak hasieratzean: fitxategia ez da vinagre-ren laster-" "marken fitxategia" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Errorea laster-markak gordetzean: huts egin du XML egitura sortzean" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Errorea laster-markak gordetzean: huts egin du XML egitura hasieratzean" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Errorea laster-markak gordetzean: huts egin du XML egitura amaitzean" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Errorea laster-markak gordetzean: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Errorea laster-markak migratzean: huts egin du XML egitura sortzean" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Errorea laster-markak migratzean: huts egin du XML egitura hasieratzean" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Errorea laster-markak migratzean: huts egin du XML egitura amaitzean" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Errorea laster-markak migratzean: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Errorea laster-markak migratzean: VNC plugina ez dago aktibatuta" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Huts egin du direktorioa sortzean" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -289,455 +473,480 @@ "Laster-marken fitxategia formatu berrira migratzen. Eragiketa hau behin " "bakarrik exekutatzen dela suposatzen da." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Errorea laster-marken fitxategi zaharra irekitzean: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migrazioa bertan behera utzita" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Ezin izan da laster-marken fitxategi zaharra kendu" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Erroko karpeta" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Izen baliogabea karpeta honentzako" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "The name \"%s\" is already used in this folder. Please use a different name." -msgstr "Karpeta honetan \"%s\" izena erabilita dago jadanik. Erabili bestelako izen bat." +msgstr "" +"Karpeta honetan \"%s\" izena erabilita dago jadanik. Erabili bestelako izen " +"bat." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Izen baliogabea elementu honentzako" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokoloa: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Ziur zaude laster-marketatik %s kentzea nahi duzula?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Ziur zaude %s kentzea nahi duzula laster-marketatik?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Kendu karpeta?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Jakin ezazu bere azpikarpeta eta elementu guztiak ere kendu egingo direla." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Kendu elementua?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Errorea laster-marka kentzean: ez da sarrera aurkitu" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Karpeta berria" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Aukeratu fitxategia" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Onartutako formatuak" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Ez dago onartutako fitxategirik" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Plugin aktibotariko bat berak ere ez du onartutako fitxategirik eskaintzen irekitzeko. " +"Aktibatu plugin batzuk eta saiatu berriro." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Ezin da honako fitxategia ireki:" msgstr[1] "Ezin dira honako fitxategiak ireki:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Ezin izan da protokolo aktiboa lortu protokoloen zerrendan." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Errorea historiaren fitxategia gordetzean: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Aukeratu VNC zerbitzaria" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "%s protokoloa ez dago onartuta." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Aukeratu urruneko mahaigaina" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Ezin izan da fitxategia ireki." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Ezin izan da fitxategia analizatu." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Okerreko balioa 'partekatua' banderarentzako: %d. 0 edo 1 izan behar duela " -"suposatzen da. Ez ikusi egiten." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Plugin bat berak ere ez du fitxategia ezagutzen." -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Ezin izan da ostalariaren helbidea aurkitu fitxategian." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Eragiketa baliogabea" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "'Arrastatu eta jaregin' eragiketatik jasotako datuak baliogabeak dira." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Gertuko ostalariak" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "'.vnc' fitxategi bat irekitzen du" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "fitxategi-izena" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Ireki vinagre pantaila osoko moduan" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Sortu maila goreneko leihoa vinagre-ren existitzen den instantzia batean" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Ireki vinagre-k ezagututako fitxategia" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "fitxategi-izena" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[zerbitzaria:ataka]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Honako errorea gertatu da:" msgstr[1] "Honako erroreak gertatu dira:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- VNC bezeroa GNOMErako" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Urruneko mahaigainen ikustailea" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Exekutatu 'vinagre --help' komando-lerroko aukera erabilgarri guztien " "zerrenda ikusteko" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Huts egin du avahi ostalari-izena ebaztean: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "%s pluginak jadanik arakatzaile bat erregistratuta du %s zerbitzuarentzako." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Huts egin du mDNS arakatzailea gehitzean %s zerbitzuarentzako." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Huts egin du ostalariak arakatzean: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -msgid "Connection to host %s was closed." -msgstr "%s ostalariaren konexioa itxi egin da." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Huts egin du mDNS arakatzailea hasieratzean: %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "%s ostalariaren konexioa itxi egin da." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Konexioa itxi egin da" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Huts egin du %s ostalarian autentifikatzean" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Huts egin du autentifikatzean" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Konektatzen..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Itxi konexioa" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Pluginen kudeatzailea" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Plugina" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Gaituta" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Konfiguratu" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Aktibatu" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Aktibatu _guztiak" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Desaktibatu guztiak" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "Plugin honi _buruz" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "K_onfiguratu plugina" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Ezin da hobespenen kudeatzailea hasieratu." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Errorea ostalariarekin konektatzean" - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Huts egin du %s ostalarian autentifikatzean" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Huts egin du autentifikatzean" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Irten _pantaila osotik" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "%s ostalariaren autentifikazio-metodoa ez dago onartuta. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Autentifikazioa ez dago onartuta" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Errorea azken konexioa gordetzean." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Errorea kredentziala gako-sortan gordetzean." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Errorea autentifikatzean" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Erabiltzaile-izena behar da ordenagailu honetara sarbidetzeko." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Pasahitza behar da ordenagailu honetara sarbidetzeko." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Ikonotu leihoa" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Ezin izan da konexioaren pantaila-argazkia lortu." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Eskalatzea" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Gorde pantaila-argazkia" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Irakurtzeko soilik" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s(r)en pantaila-argazkia" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Egin pantaila-argazkia" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Errorea pantaila-argazkia gordetzean" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Bidali Ktrl+Alt+Ezab" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Ezinezkoa da zerbitzua ongi lortzea: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Mahaigainaren izena:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Ezinezkoa da konexioa sortzea: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Ataka:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Ezinezkoa da korrontearen kanalizazioa onartzea: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimentsioak:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Ezinezkoa da kontaktuaren izena lortzea: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Ezin izan da konexioaren pantaila-argazkia lortu." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Ezinezkoa da avatarra lortzea: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "%s(r)en pantaila-argazkia" +msgid "%s wants to share his desktop with you." +msgstr "%s(e)k bere mahaigaina zurekin partekatzea nahi du." -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Gorde pantaila-argazkia" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Eskalatzea ez dago onartuta instalazio honetan.\n" -"\n" -"Irakurri README fitxategia (Vinagre-rekin batera datorrena) eginbide hau " -"nola gaitzen den jakiteko." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Mahaigaina partekatzeko gonbidapena" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Ordenagailua" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Editatu" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Ikusi" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "Laster-_markak" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Konektatu urruneko ordenagailuarekin" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Ireki .VNC fitxategia" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Irten programatik" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Editatu aplikazioaren hobespenak" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Ireki laster-marka" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Konektatu ordenagailu honekin" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Editatu laster-marka" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Editatu hautatutako laster-markaren xehetasunak" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Kendu laster-marketatik" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Kendu unean hautatutako konexioa laster-marketatik" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "Karpeta _berria" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Sortu karpeta berri bat" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Edukia" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Ireki Vinagre-en eskuliburua" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Aplikazio honi buruz" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Tresna-barra" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Erakutsi edo ezkutatu tresna-barra" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Egoera-barra" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Erakutsi edo ezkutatu egoera-barra" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Albo-_panela" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Erakutsi edo ezkutatu albo-panela" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Itxi uneko konexioa" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "It_xi denak" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Itxi konexio aktibo guztiak" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Gehitu laster-markei" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Gehitu uneko konexioa laster-markei" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Egin pantaila-argazkia" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Egin uneko konexioaren pantaila-argazkia" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Bidali Ktrl+Alt+Ezab konexio aktibora" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Ikusi uneko ordenagailua pantaila osoan" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Jatorrizko tamaina" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Leihoa doitzen du urruneko mahaigainaren tamainara" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "E_skalatzea" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Doitu urruneko pantaila uneko leihoaren tamainara" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Irakurtzeko soilik" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Desgaitu sagua eta teklatua" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Tresna-barra" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Erakutsi edo ezkutatu tresna-barra" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Egoera-barra" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Erakutsi edo ezkutatu egoera-barra" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Albo-_panela" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Erakutsi edo ezkutatu albo-panela" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Errore bat gertatu da:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "GNOME mahaigaineko VNC bezero bat da Vinagre" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Ezin izan da eraikin-fitxategia kargatu: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre urruneko mahaigainen ikustailea da GNOMErako." -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -748,7 +957,7 @@ "Foundation-ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, " "edo (nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -760,7 +969,7 @@ "HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago nahi izanez gero, " "ikus GNU Lizentzia Publiko Orokorra." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -768,30 +977,26 @@ "Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat jasoko " "zenuen. Hala ez bada, ikusi ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "Iñaki Larrañaga Murgoitio " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre-ren web gunea" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Ezin izan da vinagre-ui.xml batu: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Azken konexioak" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Ireki %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Sakatu Ktrl + Alt kurtsorea askatzeko" - diff -Nru vinagre-2.26.1/po/fi.po vinagre-2.29.1/po/fi.po --- vinagre-2.26.1/po/fi.po 2009-02-19 12:22:16.000000000 +0000 +++ vinagre-2.29.1/po/fi.po 2009-08-28 17:21:05.000000000 +0100 @@ -1,26 +1,27 @@ # Finnish messages for vinagre # Copyright (C) Ilkka Tuohela. # This file is distributed under the same license as the vinagre package. -# Ilkka Tuohela , 2007. +# Ilkka Tuohela , 2007-2009. +# Tommi Vainikainen , 2009. # msgid "" msgstr "" "Project-Id-Version: vinagre\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-19 10:31+0300\n" -"PO-Revision-Date: 2009-02-18 11:47+0200\n" -"Last-Translator: Ilkka Tuohela \n" +"POT-Creation-Date: 2009-08-27 22:15+0300\n" +"PO-Revision-Date: 2009-08-27 22:15+0300\n" +"Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \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" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Tietoja" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "O_hje" @@ -29,125 +30,121 @@ msgstr "Käytä etätyöpöytiä" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Etätyöpöytien käyttö" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Todentaminen vaaditaan" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Yhteyden valinnat" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Yhteys" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Kansio" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Käyttöliittymä" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Valinnat" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Yläkansio" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Mihin tietokoneeseen haluat ottaa yhteyttä?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Kaikki ylläolevat kentät ovat pakollisia" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Kaikki ylläolevat kentät ovat pakollisia" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Todentaminen vaaditaan" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Kirjanmerkit" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1066 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Yhteys" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Yhteyden valinnat" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Kansio" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Verkkonimi:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Käyttöliittymä" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Valinnat" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Yläkansio" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Asetukset" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Näytetäänkö välilehdet myös silloin kun avoinna on vain yksi etäistunto" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Näytetäänkö valikoiden oikotiet (pikanäppäimet)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Mihin tietokoneeseen haluat ottaa yhteyttä?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "Näytä välilehdet _aina" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "Todenna" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Kokoruutu" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Verkkonimi:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nimi:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Salasana:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokolla:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Muista nämä tunnukset" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Sovitus" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Näytä valikkopikanäppäimet" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Käyttäjänimi:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Vain näyttö" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Käytössä olevat liitännäiset" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "palvelin, palvelin:näyttö tai palvelin::portti" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Luettelo aktiivista liitännäisistä. Se sisältää aktiivisten liitännäisten " +"”sijainnin” (”Location”). Katso tiedostosta .vinagre-plugin kuinka selvität " +"annetun liitännäisen ”sijainnin”." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Aiempien yhteyksien enimmäismäärä yhdistysikkunassa" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -157,7 +154,7 @@ "todeksi jos haluat käyttää oikoteitä. Huomaa, että jos ne ovat käytössä, " "kaappaa ohjelma nämä näppäimet eikä niitä lähetetä etäistunnolle." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -166,15 +163,15 @@ "haluat näyttää välilehdet vain silloin kun käytössä on useampi kuin yksi " "aktiivinen yhteys." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Määrittää verkkonimien pudotusvalikon kohtien enimmäismäärän." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Käsittelijä \"vnc://\"-URL:eille" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -184,10 +181,20 @@ "istunnot auki tai katkaisemaan ne. Aseta tämä todeksi, jos haluat jakaa " "istunnon muiden asiakkaiden kanssa." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Pidetäänkö muut asiakkaat yhdistettyinä" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Näytetäänkö välilehdet myös silloin kun avoinna on vain yksi etäistunto" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Näytetäänkö valikoiden oikotiet (pikanäppäimet)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Etätyöpöydän VNC-tiedosto" @@ -196,95 +203,273 @@ msgid "Remote Desktop Connection" msgstr "Etätyöpöytäyhteys" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Käytä Unix/Linux-päätteitä" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Portti:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH-tuki" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "Väärä arvo ”shared”-lipulle: %d. Sen tulee olla 0 tai 1. Ohitetaan." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Ota käyttöön skaalaava tila" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC-valitsimet:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Näytä VNC-valitsimet" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Käytä Unix/Linux-, Windows- ja muita koneita." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Tiedostoa ei voi jäsentää." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Tiedosto ei ole VNC-tiedosto: Puuttuu yhteysryhmä (”connection”)." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Tiedosto ei ole VNC-tiedosto: Puuttuu isäntä-avain (”host”)." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC-valitsimet" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Vain näyttö" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Sovitus" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC-tiedostot" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Työpöydän nimi:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Mitat:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Virhe yhdistettäessä tietokoneeseen." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Todennusmenetelmä palvelimella %s ei ole tuettu. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Todennusmenetelmä ei ole tuettu" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Virhe todennuksessa" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Yhteydenotto tähän tietokoneeseen vaatii käyttäjätunnuksen." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Yhteydenotto tähän tietokoneeseen vaatii salasanan." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "_Sovitus" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Sovittaa etänäytön tämänhetkisen ikkunan kokoon" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Ei lähetä hiiri- ja näppäimistötapahtumia" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Alkuperäinen k_oko" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Sovittaa ikkunan etätyöpöydän kokoon" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Lähetä Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Lähettää Ctrl-Alt-Del etätietokoneelle" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Sovitus" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Vain katselu" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Sovitus ei ole tuettu tässä asennuksessa.\n" +"\n" +"Lue vinagren mukana toimitetusta README-tiedostosta lisätietoja, kuinka voit " +"ottaa tämän toiminnon käyttöön." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC-tuki" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Valikko nopeaan etäyhteyden avaamiseen" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagren sovelmatehdas" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Vinagrea ei voi suorittaa:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Avaa etätyöpöytien katselin" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Avaa kirjanmerkkisi" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokolla %s ei ole tuettu." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Virhe alustettaessa kirjanmerkkejä: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:275 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Tuntematon virhe" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Virhe alustettaessa kirjanmerkkejä: Tiedosto vaikuttaa tyhjältä" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Virhe alustettaessa kirjanmerkkejä: Tiedosto ei ole vinagre-" "kirjanmerkkitiedosto" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Virhe tallennettaessa kirjanmerkkejä: Virhe luotaessa XML-rakennetta" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "Virhe tallennettaessa kirjanmerkkejä: Virhe alustettaessa XML-rakennetta" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Virhe tallennettaessa kirjanmerkkejä: Virhe viimeisteltäessä XML-rakennetta" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Virhe tallennettaessa kirjanmerkkejä: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Virhe siirrettäessä kirjanmerkkejä: XML-rakenteen luonti epäonnistui" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Virhe siirrettäessä kirjanmerkkejä: XML-rakenteen alustus epäonnistui" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Virhe siirrettäessä kirjanmerkkejä: XML-rakenteen viimeistely epäonnistui" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Virhe siirrettäessä kirjanmerkkejä: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Virhe siirrettäessä kirjanmerkkejä: VNC-liitännäinen ei ole aktivoitu" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Hakemiston luonti epäonnistui" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -292,444 +477,479 @@ "Siirretään kirjanmerkkitiedosto uuteen muotoon. Tämä toiminto on tarkoitus " "tehdä vain kerran." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Virhe avattaessa vanhaa kirjanmerkkitiedostoa: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Siirto peruttiin" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Vanhaa kirjanmerkkikansiota ei voi poistaa" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Juurikansio" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Virheellinen nimi tälle kansiolle" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Haluatko varmasti poistaa kohteen %s kirjanmerkeistä?" +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "Nimi \"%s\" on jo käytössä tässä kansiossa. Valitse toinen nimi." -#: ../src/vinagre-bookmarks-ui.c:241 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "Kohteen nimi on virheellinen" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokolla: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Haluatko varmasti poistaa kohteen %s kirjanmerkeistä?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Poista kansio?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Huomaa että kaikki sen alakansiot ja kohteet poistetaan myös." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Poista kohde?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Virhe poistettaessa kirjanmerkkiä: Kohtaa ei löydy" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Uusi kansio" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Valitse tiedosto" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1156 -msgid "Supported formats" -msgstr "Tuetut muodot" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Ei ole yhtään tuettua tiedostoa" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Mikään aktiivista liitännäisistä ei tarjoutunut avaamaan tiedostoa. Ota " +"käyttöön lisää liitännäisiä ja yritä uudelleen." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Seuraavaa tiedostoa ei voitu avata:" msgstr[1] "Seuraavia tiedostoja ei voitu avata:" -#: ../src/vinagre-connect.c:179 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Protokollaluettelosta ei saatu aktiivista protokollaa." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Virhe tallennettaessa historiatiedostoa: %s" -#: ../src/vinagre-connect.c:191 -msgid "Choose a VNC Server" -msgstr "Valitse VNC-palvelin" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Valitse etätyöpöytä" -#: ../src/vinagre-connection.c:600 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokolla %s ei ole tuettu." - -#: ../src/vinagre-connection.c:695 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Tiedostoa ei voi avata." -#: ../src/vinagre-connection.c:714 -msgid "Could not parse the file." -msgstr "Tiedostoa ei voi jäsentää." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Mikään liitännäisistä ei tunnistanut tiedostoa." -#: ../src/vinagre-connection.c:759 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "Väärä arvo ”shared”-lipulle: %d. Sen tulee olla 0 tai 1. Ohitetaan." - -#: ../src/vinagre-connection.c:765 -msgid "Could not find the host address in the file." -msgstr "Tiedostosta ei löytynyt verkkonimen osoitetta." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Virheellinen toiminto" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "" "Vedä- ja pudota -toiminnosta vastaanotetut tiedot eivät ole kelvollisia." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Lähellä olevat palvelimet" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Avaa .vnc-tiedoston" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "tiedostonimi" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Avaa Vinagre kokoruututilassa" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Luo uusi päätason ikkuna aikaisempaan vinagren instanssiin" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Avaa Vinagren tunnistama tiedosto" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "tiedostonimi" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[palvelin:portti]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Tapahtui seuraava virhe:" msgstr[1] "Tapahtui seuraavat virheet:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- Gnomen VNC-asiakas" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Etätyöpöytien katselin" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "Suorita 'vinagre --help' nähdäksesi kaikki mahdolliset valitsimet" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Avahi-verkkonimeä ei voitu selvittää: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Liitännäinen %s on jo rekisteröinyt selailmen palvelulle %s." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "mDNS-selaimen lisääminen palvelulle %s epäonnistui." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Palvelimia ei voitu selata: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -msgid "Connection to host %s was closed." -msgstr "Yhteys laitteeseen %s suljettiin." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS-selaimen alustus epäonnistui: %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "Yhteys osoitteeseen %s suljettiin." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Yhteys suljettiin" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Todennus palvelimelle %s epäonnistui" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Todennus epäonnistui" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Yhdistetään..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:882 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Sulje yhteys" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Liitännäisten hallinta" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Liitännäinen" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Käytössä" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Asetukset" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Ota käyttöön" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ota _kaikki käyttöön" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Poista kaikki käytöstä" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Tietoja liitännäisestä" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "Liitännäisen _asetukset" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Asetusten hallintaohjelmaa ei voi alustaa." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Virhe yhdistettäessä tietokoneeseen." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Todennus palvelimelle %s epäonnistui" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Poistu kokoruututilasta" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Todennus epäonnistui" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Todennusmenetelmä palvelimella %s ei ole tuettu. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Todennusmenetelmä ei ole tuettu" - -#: ../src/vinagre-tab.c:464 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Virhe tallennettaessa äskettäistä yhteyttä." -#: ../src/vinagre-tab.c:496 -msgid "Error saving the credential on the keyring." -msgstr "Virhe tallennettaessa tunnuksia avainrenkaaseen." - -#: ../src/vinagre-tab.c:751 ../src/vinagre-tab.c:768 -msgid "Authentication error" -msgstr "Virhe todennuksessa" +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Virhe tallennettaessa kirjautumistietoja avainnippuun." -#: ../src/vinagre-tab.c:752 -msgid "A username is required in order to access this machine." -msgstr "Yhteydenotto tähän tietokoneeseen vaatii käyttäjätunnuksen." - -#: ../src/vinagre-tab.c:769 -msgid "A password is required in order to access this machine." -msgstr "Yhteydenotto tähän tietokoneeseen vaatii salasanan." - -#: ../src/vinagre-tab.c:895 -msgid "Minimize window" -msgstr "Pienennä ikkuna" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Kuvakaappausta yhteydestä ei voi ottaa." -#: ../src/vinagre-tab.c:910 ../src/vinagre-tab.c:911 -msgid "Scaling" -msgstr "Sovitus" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Tallenna kuvakaappaus" -#: ../src/vinagre-tab.c:920 ../src/vinagre-tab.c:921 -msgid "Read only" -msgstr "Vain katselu" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Kuvakaappaus yhteydestä %s" -#. Machine menu -#: ../src/vinagre-tab.c:931 ../src/vinagre-tab.c:932 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Ota kuvakaappaus" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Virhe tallennettaessa kuvakaappausta" -#: ../src/vinagre-tab.c:940 ../src/vinagre-tab.c:941 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Lähetä Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Mahdotonta saada palveluominaisuutta: %s" -#: ../src/vinagre-tab.c:1065 -msgid "Desktop Name:" -msgstr "Työpöydän nimi:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Mahdotonta luoda yhteyttä: %s" -#: ../src/vinagre-tab.c:1067 -msgid "Port:" -msgstr "Portti:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Mahdotonta hyväksyä virtatuubia: %s" -#: ../src/vinagre-tab.c:1068 -msgid "Dimensions:" -msgstr "Mitat:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Mahdotonta saada yhteystiedon nimeä: %s" -#: ../src/vinagre-tab.c:1134 -msgid "Could not get a screenshot of the connection." -msgstr "Kuvakaappausta yhteydestä ei voi ottaa." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Mahdotonta saada avatarta: %s" -#: ../src/vinagre-tab.c:1142 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "Kuvakaappaus yhteydestä %s" +msgid "%s wants to share his desktop with you." +msgstr "%s haluaa jakaa työpöytänsä kanssasi." -#: ../src/vinagre-tab.c:1145 -msgid "Save Screenshot" -msgstr "Tallenna kuvakaappaus" - -#: ../src/vinagre-tab.c:1209 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Sovitus ei ole tuettu tässä asennuksessa.\n" -"\n" -"Lue vinagren mukana toimitetusta README-tiedostosta lisätietoja, kuinka voit " -"ottaa tämän toiminnon käyttöön." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Työpöydän jakokutsu" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Tietokone" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Muokkaa" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Näytä" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Kirjanmerkit" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Yhdistä etätietokoneeseen" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Avaa .VNC-tiedosto" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Lopeta ohjelma" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Muokkaa sovelluksen asetuksia" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Avaa kirjanmerkki" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Yhdistä tähän tietokoneeseen" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Muokkaa kirjanmerkkiä" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Muokkaa valitun kirjanmerkin yksityiskohtia" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Poista kirjanmerkeistä" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Poista valittu yhteys kirjanmerkeistä" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Uusi kansio" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Luo uusi kansio" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Sisältö" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Avaa vinagren ohje" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Tietoja tästä ohjelmasta" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Työkalupalkki" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Näytä tai piilota työkalupalkki" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Tilarivi" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Näytä tai piilota tilarivi" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Sivu_palkki" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Näytä tai piilota sivupalkki" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Sulje nykyinen yhteys" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "Su_lje kaikki" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Sulje kaikki aktiiviset yhteydet" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Lisää kirjanmerkkeihin" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Lisää nykyinen yhteys kirjanmerkkeihin" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Ota kuvakaappaus" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Ota kuvakaappaus aktiivisesta yhteydestä" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Lähetä Ctrl-Alt-Del aktiiviselle yhteydelle" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Näytä nykyinen yhteys kokoruututilassa" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Alkuperäinen k_oko" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Sovittaa ikkunan etätyöpöydän kokoon" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "_Sovitus" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Sovita etänäyttö tämänhetkisen ikkunan kokoon" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Vain luku" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Poista hiiri ja näppäimistö käytöstä" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Työkalupalkki" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Näytä tai piilota työkalupalkki" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Tilarivi" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Näytä tai piilota tilarivi" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Sivu_palkki" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Näytä tai piilota sivupalkki" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Tapahtui virhe:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre on VNC-asiakas Gnome-työpöydälle" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Ei voitu ladata käyttöliittymän rakennustiedostoa: %s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre on etätyöpöytäkatselin Gnome-työpöydälle" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -741,7 +961,7 @@ "Software Foundation on ne julkaissut; joko lisenssin version 2, tai " "(valinnan mukaan) minkä tahansa myöhemmän version mukaisesti." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -753,7 +973,7 @@ "laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistä " "lisää yksityiskohtia." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -761,7 +981,7 @@ "Tämän ohjelman mukana pitäisi tulla kopio GPL-lisenssistä; jos näin ei ole, " "lue lisää sivulta ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Ilkka Tuohela, 2007.\n" @@ -769,28 +989,63 @@ "\n" "http://www.gnome.fi/" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagren WWW-sivut" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Tiedostoa vinagre-ui.xml ei voi liittää: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Viimeisimmät yhteydet" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Avaa %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Vapauta kohdistin painamalla Ctrl+Alt" +#~ msgid "Failed to request name: %s" +#~ msgstr "Nimipyyntö epäonnistui: %s" + +#~ msgid "No error given" +#~ msgstr "Ei annettua virhettä" + +#~ msgid "Connection" +#~ msgstr "Yhteys" + +#~ msgid "Folder" +#~ msgstr "Kansio" + +#~ msgid "host or host:display or host::port" +#~ msgstr "palvelin, palvelin:näyttö tai palvelin::portti" + +#~ msgid "Supported formats" +#~ msgstr "Tuetut muodot" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Valitse VNC-palvelin" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "Tiedostosta ei löytynyt verkkonimen osoitetta." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Avaa .vnc-tiedoston" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- Gnomen VNC-asiakas" + +#~ msgid "Minimize window" +#~ msgstr "Pienennä ikkuna" + +#~ msgid "_Read only" +#~ msgstr "_Vain luku" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Vapauta kohdistin painamalla Ctrl+Alt" #~ msgid "Editing a bookmark" #~ msgstr "Kirjanmerkin muokkaus" @@ -829,9 +1084,6 @@ #~ "Sovitus ei toimi oikein yhdistetyillä (composite) ikkunoilla. Poista " #~ "efektit käytöstä ja yritä uudestaan." -#~ msgid "_Port:" -#~ msgstr "_Portti:" - #~ msgid "Image" #~ msgstr "Kuva" diff -Nru vinagre-2.26.1/po/fr.po vinagre-2.29.1/po/fr.po --- vinagre-2.26.1/po/fr.po 2009-03-20 23:30:04.000000000 +0000 +++ vinagre-2.29.1/po/fr.po 2009-08-24 21:47:01.000000000 +0100 @@ -11,9 +11,10 @@ msgid "" msgstr "" "Project-Id-Version: vinagre HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-20 23:14+0100\n" -"PO-Revision-Date: 2009-03-20 23:15+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=vinagre&component=general\n" +"POT-Creation-Date: 2009-08-18 12:06+0000\n" +"PO-Revision-Date: 2009-08-22 21:41+0200\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" @@ -21,11 +22,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "À _propos" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "Aid_e" @@ -35,127 +36,122 @@ msgstr "Accéder à des bureaux distants" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Visionnneur de bureaux distants" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Une authentification est requise" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Options de connexion" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Connexion" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Dossier" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interface" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Options" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Dossier parent" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Sur quelle machine souhaitez-vous vous connecter ?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Tous les champs ci-dessus sont obligatoires" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Tous les champs ci-dessus sont obligatoires" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Une authentification est requise" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Signets" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Connexion" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Options de connexion" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Dossier" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Hôte :" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interface" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Options" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Dossier parent" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Préférences" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Indique s'il faut afficher les onglets même quand il n'y a qu'une connexion " -"active" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Indique s'il faut afficher les raccourcis clavier du menu" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Sur quelle machine souhaitez-vous vous connecter ?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Toujours afficher les onglets" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "S'_authentifier" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Plein écran" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Hôte :" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nom :" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Mot de passe :" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protocole :" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Se souvenir de l'information d'identification" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "M_ise à l'échelle" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "A_fficher les raccourcis du menu" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "Nom d'_utilisateur :" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Vue seule" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Greffons actifs" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "hôte ou hôte:affichage ou hôte::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Liste des greffons activés. Elle contient l'emplacement (« Location ») des " +"greffons activés. Voir le fichier .vinagre-plugin pour obtenir l'emplacement " +"d'un greffon donné." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "" "Nombre maximal de lignes d'historique dans la boîte de dialogue de connexion" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -165,7 +161,7 @@ "« true » pour les activer. Notez que si elles sont activées, ces touches " "seront interceptées par le menu et ne seront pas envoyées à l'hôte distant." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -173,16 +169,16 @@ "Définir à « true » pour toujours afficher les onglets. Définir à « false » " "pour les afficher uniquement quand il y a plus d'une connexion active." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Indique le nombre maximal d'éléments dans la liste déroulante des hôtes." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Le gestionnaire des URL « vnc:// »" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -192,10 +188,21 @@ "les autres clients connectés ou d'abandonner les connexions existantes. " "Définir la valeur à « true » pour partager le bureau avec les autres clients." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Indique s'il faut laisser les autres clients connectés" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Indique s'il faut afficher les onglets même quand il n'y a qu'une connexion " +"active" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Indique s'il faut afficher les raccourcis clavier du menu" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Fichier d'accès à distance (VNC)" @@ -204,104 +211,288 @@ msgid "Remote Desktop Connection" msgstr "Connexion à un bureau distant" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Accéder à des terminaux Unix/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port :" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Prise en charge de SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"La valeur %d de l'indicateur « shared » est incorrecte. Elle devrait être 0 " +"ou 1. Elle est ignorée." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Active le mode redimensionné" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Options VNC :" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Affiche les options VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Accéder à des machines Unix/Linux, Windows et autres." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Impossible d'analyser le fichier." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "" +"Le fichier n'est pas un fichier VNC : le groupe « connection » est manquant." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Le fichier n'est pas un fichier VNC : la clé « host » est manquante." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Options VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Vue seule" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "M_ise à l'échelle" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Fichiers VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nom du bureau :" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensions :" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Erreur lors de la connexion à l'hôte" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "" +"La méthode d'authentification sur l'hôte %s n'est pas prise en charge (%u)." + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Méthode d'authentification non prise en charge" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Erreur d'authentification" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "" +"Un nom d'utilisateur est obligatoire pour avoir accès à cet ordinateur." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Un mot de passe est obligatoire pour avoir accès à cet ordintateur." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "_Mise à l'échelle" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Adapte la taille de l'écran distant à la taille actuelle de la fenêtre" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "N'envoie pas les évènements souris et clavier" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Taille _originale" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Ajuste la taille de la fenêtre à celle du bureau distant" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Envoyer Ctrl-Alt-Suppr" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Envoie Ctrl+Alt+Suppr à la machine distante" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Mise à l'échelle" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Lecture seule" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"La mise à l'échelle n'est pas prise en charge dans cette installation.\n" +"\n" +"Lisez le fichier README (distribué avec Vinagre) pour apprendre comment " +"activer cette fonctionnalité." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Prise en charge de VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Un menu pour accéder rapidement à des machines distantes" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Fabrique pour l'applet Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Impossible de lancer vinagre :" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Ouvrir le visionnneur de bureaux distants" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Accéder à vos signets" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Le protocole %s n'est pas pris en charge." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Impossible d'initialiser les signets : %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Erreur inconnue" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Impossible d'initialiser les signets : le fichier semble vide" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Impossible d'initialiser les signets : le fichier n'est pas un fichier de " "signets de vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "" "Erreur lors de l'enregistrement des signets : la création de la structure " "XML a échoué" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "Erreur lors de l'enregistrement des signets : l'initialisation de la " "structure XML a échoué" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Erreur lors de l'enregistrement des signets : la finalisation de la " "structure XML a échoué" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Erreur lors de l'enregistrement des signets : %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "Erreur lors de la migration des signets : la création de la structure XML a " "échoué" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Erreur lors de la migration des signets : l'initialisation de la structure " "XML a échoué" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Erreur lors de la migration des signets : la finalisation de la structure " "XML a échoué" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Erreur lors de la migration des signets : %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" +"Erreur lors de la migration des signets : le greffon VNC n'est pas activé" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Échec lors de la création du dossier" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -309,467 +500,496 @@ "Migration du fichier des signets vers le nouveau format. Cette opération est " "censée n'être exécutée qu'une seule fois." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Erreur lors de l'ouverture du fichier des anciens signets : %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migration annulée" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Impossible de supprimer l'ancien fichier de signets" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Dossier racine" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Le nom pour ce dossier est incorrect" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." msgstr "" "Le nom « %s » est déjà utilisé dans ce dossier. Veuillez choisir un autre nom." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Le nom de cet élément est incorrect" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Voulez-vous vraiment retirer %s des signets ?" +msgid "(Protocol: %s)" +msgstr "(Protocole : %s)" -#: ../src/vinagre-bookmarks-ui.c:297 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Voulez-vous vraiment retirer %s des signets ?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Enlever le dossier ?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Note : tous les sous-répertoires et objets seront aussi supprimés." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Enlever l'élément ?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Erreur lors de l'effacement du signet : entrée non trouvée" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Nouveau dossier" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Sélectionner le fichier" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Formats pris en charge" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Il n'y a aucun fichier pris en charge" + +# Unclear sentence traduction approximative +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Aucun des greffons activés ne permet d'ouvrir un fichier pris en charge. " +"Activez des greffons et essayez de nouveau." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Impossible d'ouvrir ce fichier :" msgstr[1] "Impossible d'ouvrir ces fichiers :" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Impossible de trouver le protocole actuel dans la liste de protocoles." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Impossible d'enregistrer le fichier d'historique : %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Choisissez un serveur VNC" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Choisir un bureau distant" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Le protocole %s n'est pas pris en charge." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Le fichier n'a pas pu être ouvert." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Impossible d'analyser le fichier." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Le fichier n'est reconnu par aucun des greffons." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"La valeur %d de l'indicateur « shared » est incorrecte. Elle devrait être 0 " -"ou 1. Elle est ignorée." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Impossible de trouver l'adresse de l'hôte dans le fichier." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Opération non valable" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "" "Les données reçues lors de l'opération glisser-déposer sont incorrectes." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Hôtes à proximité" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Ouvre un fichier .vnc" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Ouvre vinagre en mode plein écran" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "nom de fichier" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "" "Crée une nouvelle fenêtre de premier niveau dans une instance existante de " "Vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Ouvre un fichier reconnu par vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "nom_de_fichier" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[serveur:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "L'erreur suivante s'est produite :" msgstr[1] "Les erreurs suivantes se sont produites :" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- Client VNC pour GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Visionneur de bureaux distants" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Exécutez « vinagre --help » pour voir une liste complète des options en ligne " "de commande" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "La résolution de nom Avahi a échoué : %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Le greffons %s a déjà enregistré un navigateur pour le service %s." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Erreur lors de l'ajout du navigateur mDNS pour le service %s." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "La découverte d'hôtes a échoué : %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Erreur d'initialisation du navigateur mDNS : %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "La connexion à l'hôte %s a été fermée." +msgid "Connection to host %s was closed." +msgstr "La connexion à l'hôte %s a été fermée." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Connexion fermée" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "L'authentification sur l'hôte %s a échoué" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "L'authentification a échoué" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Connexion en cours..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Ferme la connexion" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Gestionnaire de greffons" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Greffon" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Activé" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "C_onfigurer" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ctiver" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "_Tout activer" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "Tout _désactiver" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "À _propos du greffon" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "C_onfigurer le greffon" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Impossible d'initialiser le gestionnaire des préférences." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Erreur lors de la connexion à l'hôte" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Quitter le plein écran" -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "L'authentification sur l'hôte %s a échoué" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "L'authentification a échoué" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "" -"La méthode d'authentification sur l'hôte %s n'est pas prise en charge " -"(%u)." - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Méthode d'authentification non prise en charge" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Impossible d'enregistrer la connexion récente." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "" "Erreur lors de l'enregistrement des informations d'identification dans le " "trousseau." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Erreur d'authentification" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "" -"Un nom d'utilisateur est obligatoire pour avoir accès à cet ordinateur." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Un mot de passe est obligatoire pour avoir accès à cet ordintateur." +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Impossible d'effectuer une capture d'écran de la connexion." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Réduire la fenêtre" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Enregistrer la copie d'écran" -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Mise à l'échelle" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Copie d'écran de %s" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Lecture seule" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Erreur lors de l'enregistrement de la capture d'écran" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Prendre une copie d'écran" +#: ../vinagre/vinagre-tube-handler.c:232 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Impossible d'obtenir la propriété du service : %s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Envoyer Ctrl-Alt-Suppr" +#: ../vinagre/vinagre-tube-handler.c:289 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Échec lors de la création de la connexion : %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Nom du bureau :" +#: ../vinagre/vinagre-tube-handler.c:328 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Impossible d'accepter le tube de flux : %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port :" +#: ../vinagre/vinagre-tube-handler.c:404 +#, c-format +msgid "Failed to request name: %s" +msgstr "La requête de nom a échoué : %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensions :" +#: ../vinagre/vinagre-tube-handler.c:405 +msgid "No error given" +msgstr "Pas d'erreur donnée" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Impossible d'effectuer une capture d'écran de la connexion." +#: ../vinagre/vinagre-tube-handler.c:482 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Impossible d'obtenir le nom du contact : %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:517 #, c-format -msgid "Screenshot of %s" -msgstr "Copie d'écran de %s" +msgid "Impossible to get the avatar: %s" +msgstr "Impossible d'obtenir l'avatar : %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Enregistrer la copie d'écran" +#: ../vinagre/vinagre-tube-handler.c:538 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s souhaite partager son bureau avec vous." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"La mise à l'échelle n'est pas prise en charge dans cette installation.\n" -"\n" -"Lisez le fichier README (distribué avec Vinagre) pour apprendre comment " -"activer cette fonctionnalité." +#: ../vinagre/vinagre-tube-handler.c:543 +msgid "Desktop sharing invitation" +msgstr "Invitation à partager le bureau" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Machine" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "É_dition" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Affichage" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Signets" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Se connecter à une machine distante" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Ouvrir un fichier .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Quitter le programme" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Modifie les préférences de l'application" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Ouvrir le signet" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Se connecter à cette machine" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "M_odifier le signet" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Modifie les détails du signet sélectionné" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Retirer des signets" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Retire la connexion sélectionnée des signets" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Nouveau dossier" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Crée un nouveau dossier" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Sommaire" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Ouvre le manuel de Vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "À propos de Vinagre" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Barre d'_outils" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Affiche ou masque la barre d'outils" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Barre d'é_tat" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Affiche ou masque la barre d'état" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Panneau latéral" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Affiche ou masque le panneau latéral" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Ferme la connexion actuelle" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Tout fermer" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Ferme toutes les connexions actives" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Ajouter aux signets" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Ajoute la connexion actuelle aux signets" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Prendre une copie d'écran" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Prend une copie d'écran de la connexion active" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Envoie Ctrl+Alt+Suppr à la connexion active" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Affiche la machine actuelle en plein écran" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Taille _originale" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Ajuste la taille de la fenêtre à celle du bureau distant" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "_Mise à l'échelle" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Adapte la taille de l'écran distant à la taille actuelle de la fenêtre" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Lecture seule" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Désactive la souris et le clavier" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Barre d'_outils" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Affiche ou masque la barre d'outils" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Barre d'é_tat" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Affiche ou masque la barre d'état" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_Panneau latéral" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Affiche ou masque le panneau latéral" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Une erreur est survenue :" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre est un client VNC pour le bureau GNOME" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Le fichier de construction n'a pas pu être ouvert : %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre est un visionneur de bureau à distance pour le bureau GNOME" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -781,7 +1001,7 @@ "publiée par la Free Software Foundation ; soit la version 2 de la Licence, " "ou (à votre discrétion) une version ultérieure quelconque." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -793,7 +1013,7 @@ "CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. Voir la Licence Publique Générale " "GNU pour plus de détails." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -802,33 +1022,30 @@ "avec ce programme. Si ce n'est pas le cas, consultez ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Robert-André Mauchin , 2007\n" "Stéphane Raimbault , 2007-2008\n" "Claude Paroz , 2007-2008\n" -"Frédéric Péters , 2008" +"Frédéric Péters , 2008\n" +"Laurent Coudeur , 2009" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Site Web de Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Impossible de fusionner vinagre-ui.xml : %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "Connexions _récentes" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Ouvre %s:%d" - -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Appuyez sur Ctrl+Alt pour libérer le curseur" diff -Nru vinagre-2.26.1/po/ga.po vinagre-2.29.1/po/ga.po --- vinagre-2.26.1/po/ga.po 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/po/ga.po 2009-08-18 12:59:33.000000000 +0100 @@ -0,0 +1,982 @@ +# Irish translations for vinagre package. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the vinagre package. +# Seán de Búrca , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: vinagre.master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-08-17 11:54-0600\n" +"PO-Revision-Date: 2009-08-17 11:53-0600\n" +"Last-Translator: Seán de Búrca \n" +"Language-Team: Irish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%" +"10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n" + +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 +msgid "_About" +msgstr "_Maidir Leis Seo" + +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 +msgid "_Help" +msgstr "Cab_hair" + +#: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 +msgid "Access remote desktops" +msgstr "Déan rochtain ar dheasca cianda" + +#: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 +msgid "Remote Desktop Viewer" +msgstr "Amharcán Deasc Cianda" + +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "" + +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 +msgid "Bookmarks" +msgstr "Leabharmharcanna" + +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Ceangal" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Roghanna ceangail" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Fillteán" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 +msgid "Host:" +msgstr "Óstach:" + +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Comhéadan" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Roghanna" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "" + +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "Sainroghanna" + +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Cén meaisín leis gur mhaith leat nasc?" + +#: ../data/vinagre.ui.h:13 +msgid "_Always show tabs" +msgstr "" + +#. This is a button label, in the authentication dialog +#: ../data/vinagre.ui.h:15 +msgid "_Authenticate" +msgstr "_Fíordheimhnigh" + +#: ../data/vinagre.ui.h:16 +msgid "_Full screen" +msgstr "_Lánscáileán" + +#: ../data/vinagre.ui.h:17 +msgid "_Host:" +msgstr "Ós_tach:" + +#: ../data/vinagre.ui.h:18 +msgid "_Name:" +msgstr "_Ainm:" + +#: ../data/vinagre.ui.h:19 +msgid "_Password:" +msgstr "" + +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "" + +#: ../data/vinagre.ui.h:21 +msgid "_Remember this credential" +msgstr "" + +#: ../data/vinagre.ui.h:22 +msgid "_Show menu shortcuts" +msgstr "" + +#: ../data/vinagre.ui.h:23 +msgid "_Username:" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:3 +msgid "Maximum number of history items in connect dialog" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:4 +msgid "" +"Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " +"Note that if they are enabled, those keys will be intercepted by the menu " +"and will not be sent to the remote host." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:5 +msgid "" +"Set to \"true\" to always show the tabs. Set to \"false\" to only show the " +"tabs when there is more than one active connection." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:6 +msgid "Specifies the maximum number of items in the host dropdown entry." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:7 +msgid "The handler for \"vnc://\" URLs" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:8 +msgid "" +"When connecting to a host, the client can say to the server to leave other " +"clients connected or to drop the existent connections. Set the value to true " +"to share the desktop with the other clients." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:9 +msgid "Whether we should leave other clients connected" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "" + +#: ../data/vinagre-mime.xml.in.h:1 +msgid "Remote Desktop (VNC) file" +msgstr "" + +#: ../data/vinagre-mime.xml.in.h:2 +msgid "Remote Desktop Connection" +msgstr "" + +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Déan rochtain ar theirminéil Unix/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Roghanna VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Amharc amháin" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Scálaithe" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Comhaid VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Ainm Deisce:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Seol Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Inléite amháin" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 +msgid "A menu to quickly access remote machines" +msgstr "" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 +msgid "Vinagre Applet Factory" +msgstr "" + +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 +msgid "Could not run vinagre:" +msgstr "" + +#: ../vinagre/vinagre-applet.c:380 +msgid "Open Remote Desktop Viewer" +msgstr "" + +#: ../vinagre/vinagre-applet.c:435 +msgid "Access your bookmarks" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 +#, c-format +msgid "The protocol %s is not supported." +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:343 +#, c-format +msgid "Error while initializing bookmarks: %s" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 +msgid "Unknown error" +msgstr "Earráid anaithnid" + +#: ../vinagre/vinagre-bookmarks.c:350 +msgid "Error while initializing bookmarks: The file seems to be empty" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:357 +msgid "" +"Error while initializing bookmarks: The file is not a vinagre bookmarks file" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 +msgid "Error while saving bookmarks: Failed to create the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 +msgid "Error while saving bookmarks: Failed to initialize the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:449 +msgid "Error while saving bookmarks: Failed to finalize the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:458 +#, c-format +msgid "Error while saving bookmarks: %s" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 +msgid "Error while migrating bookmarks: Failed to create the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 +msgid "Error while migrating bookmarks: Failed to initialize the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:125 +msgid "Error while migrating bookmarks: Failed to finalize the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 +#, c-format +msgid "Error while migrating bookmarks: %s" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 +msgid "Failed to create the directory" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:262 +msgid "" +"Migrating the bookmarks file to the new format. This operation is only " +"supposed to run once." +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:270 +#, c-format +msgid "Error opening old bookmarks file: %s" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 +msgid "Migration cancelled" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:280 +msgid "Could not remove the old bookmarks file" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-tree.c:120 +msgid "Root Folder" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:78 +msgid "Invalid name for this folder" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Prótacal: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 +msgid "Remove Folder?" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:315 +msgid "Notice that all its subfolders and items will be removed as well." +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:320 +msgid "Remove Item?" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:337 +msgid "Error removing bookmark: Entry not found" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:354 +msgid "New Folder" +msgstr "" + +#: ../vinagre/vinagre-commands.c:120 +msgid "Choose the file" +msgstr "" + +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" + +#: ../vinagre/vinagre-commands.c:181 +msgid "The following file could not be opened:" +msgid_plural "The following files could not be opened:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "" + +#: ../vinagre/vinagre-connect.c:313 +#, c-format +msgid "Error while saving history file: %s" +msgstr "" + +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "" + +#: ../vinagre/vinagre-connection.c:627 +msgid "Could not open the file." +msgstr "" + +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "" + +#: ../vinagre/vinagre-fav.c:670 +msgid "Invalid operation" +msgstr "" + +#: ../vinagre/vinagre-fav.c:671 +msgid "Data received from drag&drop operation is invalid." +msgstr "" + +#: ../vinagre/vinagre-fav.c:871 +msgid "Hosts nearby" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 +msgid "Create a new toplevel window in an existing instance of vinagre" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "ainmcomhaid" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 +msgid "[server:port]" +msgstr "[freastalaí:port]" + +#: ../vinagre/vinagre-main.c:130 +msgid "The following error has occurred:" +msgid_plural "The following errors have occurred:" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#. Setup command line options +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "" + +#: ../vinagre/vinagre-main.c:193 +msgid "" +"Run 'vinagre --help' to see a full list of available command line options" +msgstr "" + +#: ../vinagre/vinagre-mdns.c:142 +#, c-format +msgid "Failed to resolve avahi hostname: %s\n" +msgstr "" + +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "" + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "" + +#: ../vinagre/vinagre-mdns.c:225 +#, c-format +msgid "Failed to browse for hosts: %s\n" +msgstr "" + +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "" + +#: ../vinagre/vinagre-notebook.c:463 +msgid "Connection closed" +msgstr "" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "" + +#: ../vinagre/vinagre-notebook.c:525 +msgid "Connecting..." +msgstr "" + +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 +msgid "Close connection" +msgstr "" + +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "" + +#: ../vinagre/vinagre-prefs.c:217 +msgid "Cannot initialize preferences manager." +msgstr "" + +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "" + +#: ../vinagre/vinagre-tab.c:495 +msgid "Error saving recent connection." +msgstr "" + +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "" + +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "" + +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Sábháil Scáilghraf" + +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Scáilghraf %s" + +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:228 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:257 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:341 +#, c-format +msgid "Failed to request name: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:342 +msgid "No error given" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:419 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:454 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:475 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:480 +msgid "Desktop sharing invitation" +msgstr "" + +#. Toplevel +#: ../vinagre/vinagre-ui.h:33 +msgid "_Machine" +msgstr "_Meaisín" + +#: ../vinagre/vinagre-ui.h:34 +msgid "_Edit" +msgstr "_Eagar" + +#: ../vinagre/vinagre-ui.h:35 +msgid "_View" +msgstr "_Amharc" + +#: ../vinagre/vinagre-ui.h:36 +msgid "_Bookmarks" +msgstr "_Leabharmharcanna" + +#: ../vinagre/vinagre-ui.h:41 +msgid "Connect to a remote machine" +msgstr "Nasc le meaisín cianda" + +#: ../vinagre/vinagre-ui.h:43 +msgid "Open a .VNC file" +msgstr "Oscail comhad .VNC" + +#: ../vinagre/vinagre-ui.h:45 +msgid "Quit the program" +msgstr "Scoir an feidhmchlár" + +#: ../vinagre/vinagre-ui.h:49 +msgid "Edit the application preferences" +msgstr "Cuir sainroghanna an fheidhmchláir in eagar" + +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. +#. Bookmarks menu +#: ../vinagre/vinagre-ui.h:56 +msgid "_Open bookmark" +msgstr "_Oscail leabharmharc" + +#: ../vinagre/vinagre-ui.h:57 +msgid "Connect to this machine" +msgstr "Nasc leis an meaisín seo" + +#: ../vinagre/vinagre-ui.h:58 +msgid "_Edit bookmark" +msgstr "Cuir leabharmharc in _eagar" + +#: ../vinagre/vinagre-ui.h:59 +msgid "Edit the details of selected bookmark" +msgstr "" + +#: ../vinagre/vinagre-ui.h:60 +msgid "_Remove from bookmarks" +msgstr "_Bain ó leabharmharcanna" + +#: ../vinagre/vinagre-ui.h:61 +msgid "Remove current selected connection from bookmarks" +msgstr "" + +#: ../vinagre/vinagre-ui.h:62 +msgid "_New Folder" +msgstr "Fillteán _Nua" + +#: ../vinagre/vinagre-ui.h:63 +msgid "Create a new folder" +msgstr "Cruthaigh fillteán nua" + +#. Help menu +#: ../vinagre/vinagre-ui.h:66 +msgid "_Contents" +msgstr "_Inneachar" + +#: ../vinagre/vinagre-ui.h:67 +msgid "Open the vinagre manual" +msgstr "Oscail an lámhleabhar vinagre" + +#: ../vinagre/vinagre-ui.h:69 +msgid "About this application" +msgstr "Maidir leis an bhfeidhmchlár seo" + +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "" + +#: ../vinagre/vinagre-ui.h:91 +msgid "Close the current connection" +msgstr "" + +#: ../vinagre/vinagre-ui.h:92 +msgid "C_lose All" +msgstr "" + +#: ../vinagre/vinagre-ui.h:93 +msgid "Close all active connections" +msgstr "" + +#. Bookmarks menu +#: ../vinagre/vinagre-ui.h:96 +msgid "_Add to bookmarks" +msgstr "" + +#: ../vinagre/vinagre-ui.h:97 +msgid "Add current connection to your bookmarks" +msgstr "" + +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Tóg scáilghraf" + +#: ../vinagre/vinagre-ui.h:105 +msgid "Take a screenshot of active connection" +msgstr "" + +#: ../vinagre/vinagre-ui.h:109 +msgid "View the current machine in full screen" +msgstr "" + +#: ../vinagre/vinagre-utils.c:75 +msgid "An error has occurred:" +msgstr "" + +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "" + +#: ../vinagre/vinagre-utils.c:456 +msgid "" +"Vinagre 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 "" +"Is bogearraí saor é Vinagre; is féidir leat é a athdháileadh nó a athrú faoi " +"théarmaí an GNU General Public License mar foilsíodh é ag an Free Software " +"Foundation; leagan 2 an License, nó (de do rogha) aon leagan níos déanaí." + +#: ../vinagre/vinagre-utils.c:460 +msgid "" +"Vinagre 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 "" +"Dáileadh Vinagre le súil go mbeidh sé úsáideach, ach GAN AON BHARÁNTA; gan " +"an baránta intuigthe INDÍOLTÓIREACHTA nó OIRIÚNACHTA D'FHEIDHM ÁIRITHE fiú. " +"Féach an GNU General Public License le haghaidh tuilleadh mionsonraí." + +#: ../vinagre/vinagre-utils.c:464 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"this program. If not, see ." +msgstr "" +"Ba chóir go bhfuair tú cóip an GNU General Public License in éineacht leis " +"an gclár seo. Mura bhfuair tú é, féach ." + +#: ../vinagre/vinagre-utils.c:486 +msgid "translator-credits" +msgstr "Seán de Búrca " + +#: ../vinagre/vinagre-utils.c:489 +msgid "Vinagre Website" +msgstr "Suíomh Gréasáin Vinagre" + +#: ../vinagre/vinagre-window.c:397 +#, c-format +msgid "Could not merge vinagre-ui.xml: %s" +msgstr "" + +#: ../vinagre/vinagre-window.c:425 +msgid "_Recent connections" +msgstr "" + +#. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu +#: ../vinagre/vinagre-window.c:585 +#, c-format +msgid "Open %s:%d" +msgstr "Oscail %s:%d" diff -Nru vinagre-2.26.1/po/gl.po vinagre-2.29.1/po/gl.po --- vinagre-2.26.1/po/gl.po 2009-03-19 19:29:39.000000000 +0000 +++ vinagre-2.29.1/po/gl.po 2009-08-19 15:46:40.000000000 +0100 @@ -1,30 +1,33 @@ -# translation of gl.po to Galego +# translation of vinagre.master.po to Galician # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Ignacio Casal Quinteiro , 2007. # Ignacio Casal Quinteiro , 2007, 2008. -# Fran Diéguez , 2009. # Mancomún - Centro de Referencia e Servizos de Software Libre , 2009. +# Suso Baleato , 2009. +# Fran Diéguez , 2009. +# Antón Méixome , 2009. msgid "" msgstr "" -"Project-Id-Version: gl\n" +"Project-Id-Version: vinagre.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-17 15:17+0100\n" -"PO-Revision-Date: 2009-03-10 20:17+0000\n" -"Last-Translator: Suso Baleato \n" -"Language-Team: Galego \n" +"POT-Creation-Date: 2009-08-19 13:45+0200\n" +"PO-Revision-Date: 2009-08-18 14:19+0200\n" +"Last-Translator: Antón Méixome \n" +"Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: gl\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" -msgstr "_Sobre" +msgstr "_Acerca de" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Axuda" @@ -33,127 +36,120 @@ msgstr "Acceso a escritorios remotos" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Visualizador de escritorios remotos" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Requírese a autenticación" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Opcións de conexión" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Conexión" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Cartafol" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interface" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Opcións" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Cartafol Pai" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Con que máquina se quere conectar?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Todos os campos de arriba son obrigatorios" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Todos os campos de arriba son obrigatorios" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Requírese a autenticación" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Marcadores" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Conexión" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Opcións de conexión" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Cartafol" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Host:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interface" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Opcións" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Cartafol pai" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Preferencias" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Indica se se deberían mostrar os separadores incluso cando hai só unha " -"conexión activa" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "A que máquina se quere conectar?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "" -"Indica se se deberían mostrar as teclas rápidas de menú (atallos de teclado)" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Mostrar sempre os separadores" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Autenticar" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Pantalla completa" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Host:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nome:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Contrasinal:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protocolo:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Lembrar esta credencial" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Escalar" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Mostrar os atallos de menú" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "Nome de _usuario:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Só visualizar" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Plugins activos" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "host ou host:pantalla ou host:porto" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Lista de plugins activos. Contén a \"Localización\" dos plugins activos. " +"Ver o ficheiro plugin-vinagre para obter a \"Location\" dun plugin dado." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Número máximo de elementos de historial no diálogo de conexión" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -163,7 +159,7 @@ "\"true\" para activalos. Repare en que se están activados estas teclas serán " "interceptadas polo menú e non se enviarán ao host remoto." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -172,16 +168,16 @@ "\"false\" para mostrar os separadores só cando hai máis dunha conexión " "activa." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Especificar o número máximo de elementos na entrada despregábel de host." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "O manipulador para os URL \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -191,10 +187,22 @@ "outros clientes conectados ou que abandone as conexións existentes. Defina o " "valor como true para compartir o escritorio con outros clientes." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Indica se se deberían manter outros clientes conectados" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Indica se se deberían mostrar os separadores incluso cando hai só unha " +"conexión activa" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "" +"Indica se se deberían mostrar as teclas rápidas de menú (atallos de teclado)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Ficheiro de escritorio remoto (VNC)" @@ -203,104 +211,285 @@ msgid "Remote Desktop Connection" msgstr "Conexión a escritorio remoto" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Acceso Unix/Linux terminais" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Porto:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "compatibilidade SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Valor incorrecto para o parámetro \"shared\": %d. Tería que ser 0 ou 1. " +"Ignorándoo." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Activar o modo escalado" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Opcións de VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Mostrar as opcións de VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Acceso Unix/Linux, Windows e outras máquinas." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Non foi posíbel analizar o ficheiro." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "O ficheiro non é de VNC. Non se atopa o grupo \"conexión\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "O ficheiro non é un VNC: Non se atopa a chave \"host\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Opcións VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Só visualizar" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Escalar" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Ficheiros VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nome do escritorio:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensións:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Houbo un erro ao conectar co host." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "O método de autenticación co host %s non se admite. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Autenticación non admitida" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Erro de autenticación" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Requírese un nome de usuario para acceder a esta máquina." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Requírese un contrasinal para acceder a esta máquina." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "E_scalar" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Axustar a pantalla remota ao tamaño da xanela actual" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Desactiva o rato e os eventos de teclado" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Tamaño _orixinal" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Axustar a xanela ao tamaño do escritorio remoto" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Enviar Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Envia Ctrl+Alt+Del á máquina remota" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Escalar" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Só de lectura" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"O escalado non é compatíbel nesta instalación.\n" +"\n" +"Lea o ficheiro README (distribuído co Vinagre) para saber como activar esta " +"característica." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Compatibilidade VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Un menú para acceder rapidamente a máquinas remotas" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" -msgstr "Fábrica de miniaplicacións Vinagre" +msgstr "Fábrica de miniaplicativos Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Non se puido executar o Vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Abrir o visualizador de escritorio remoto" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Acceder aos seus marcadores" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Non se admite o protocolo %s." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Houbo un erro ao inicializar os marcadores: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Erro descoñecido" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "" "Produciuse un erro ao iniciar os marcadores: o ficheiro parece que está " "baleiro" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Produciuse un erro ao iniciar os marcadores: o ficheiro non é un ficheiro de " "marcadores do Vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "" "Produciuse un erro ao gardar os marcadores: fallou ao crear a estrutura XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "Produciuse un erro ao gardar os marcadores: fallou ao inicializar a " "estrutura XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Produciuse un erro ao gardar os marcadores: fallou ao finalizar a estrutura " "XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Houbo un erro ao gardar os marcadores: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "Produciuse un erro ao migrar os marcadores: fallou ao crear a estrutura XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Produciuse un erro ao migrar os marcadores: fallou ao inicializar a " "estrutura XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Produciuse un erro ao migrar os marcadores: fallou ao finalizar a estrutura " "XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Produciuse un erro ao migrar os marcadores: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" +"Produciuse un erro ao migrar os marcadores: o plugin VNC non está activado" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Produciuse un erro ao crear o directorio" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -308,451 +497,495 @@ "Migrando o ficheiro de marcadores a un formato novo. Esta operación só " "debería ser executada unha vez." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Produciuse un erro ao abrir o ficheiro antigo de marcadores: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migración cancelada" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Non se puido eliminar o ficheiro antigo de marcadores" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" -msgstr "Cartafol Raíz" +msgstr "Cartafol raíz" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "O nome non é válido para este cartafol" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "" +"O nome \"%s\" xa está sendo empregado neste cartafol. Empregue outro nome " +"diferente." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "O nome non é válido para este elemento" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Está seguro de que quere eliminar %s dos marcadores?" +msgid "(Protocol: %s)" +msgstr "(Protocolo: %s)" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Está seguro de que quere eliminar %s dos marcadores?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Quere eliminar o cartafol?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "" "Teña en conta que tamén se eliminarán todos os seus subcartafoles e " "elementos." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Quere eliminar o elemento?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Produciuse un erro ao eliminar o marcador: non se encontrou a entrada" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Cartafol novo" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Seleccione o ficheiro" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Formatos soportados" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Non hai ficheiros compatíbeis" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Ningún dos plugins activos ofrece un ficheiro compatíbel que abrir. Activar " +"algúns plugins e probar outra vez." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Non foi posíbel abrir o seguinte ficheiro:" msgstr[1] "Non foi posíbel abrir os seguintes ficheiros:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Non se puido obter o protocolo activo na lista de protocolo." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Produciuse un erro ao gardar o ficheiro de historial: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Escolla un servidor VNC" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Escoller un escritorio remoto" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "O protocolo %s non se soporta." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Non se puido abrir o ficheiro." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Non foi posíbel analizar o ficheiro." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "O ficheiro non foi recoñecido por ningún dos plugins." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Valor incorrecto para o parámetro \"shared\": %d. Tería que ser 0 ou 1. " -"Ignorándoo." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Non se puido encontrar o enderezo do host no ficheiro." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" -msgstr "Operación non válida" +msgstr "A operación non é válida" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "" "Os datos recibidos desde a operación arrastrar e soltar non son válidos." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Hosts próximos" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Abre un ficheiro .vnc" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "nome de ficheiro" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Abrir vinagre en modo de pantalla completa" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "" "Crear unha xanela nova de nivel superior nunha instancia existente do Vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Abrir un ficheiro recoñecido por vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "nome_de_ficheiro" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[servidor:porto]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Ocorreu o seguinte erro:" msgstr[1] "Ocorreron os seguintes erros:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- Cliente VNC para o Gnome" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Visualizador de escritorios remotos" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Execute 'vinagre --help' para ver unha lista completa das opcións " -"dispoñíbeis de liña de comandos" +"dispoñíbeis na liña de ordes" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" -msgstr "Produciuse un erro ao resolver o nome do host Avahi: %s\n" +msgstr "Produciuse un erro ao resolver o nome do host avahi: %s\n" + +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "O plugin %s xa ten rexistrado un navegador para o servizo %s." -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Produciuse un fallo ao engadir o navegador mDNS para o servizo %s." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Produciuse un erro ao navegar polos hosts: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Produciuse un fallo ao iniciar o navegador mDNS: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "A conexión co host %s pechouse." +msgid "Connection to host %s was closed." +msgstr "A conexión co host %s cerrouse." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Conexión pechada" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Fallou a autenticación co host %s" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Fallou a autenticación" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Conectando..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Pechar a conexión" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Xestor de plugin" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Plugin" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Activado" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "C_onfigurar" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ctivar" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ac_tivalos todos" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Desactivalos todos" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Acerca do plugin" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "C_onfigurar o plugin" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Non é posíbel inicializar o xestor de preferencias." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Houbo un erro ao conectar co host." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Fallou a autenticación co host %s" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Deixar a pantalla completa" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Fallou a autenticación" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "O método de autenticación co host %s non é soportado. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Autenticación non soportada" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Erro ao gardar a conexión recente." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Produciuse un erro ao gardar a credencial no anel de chaves." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Produciuse un erro ao gardar as credenciais no anel de chaves." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Erro de autenticación" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Requírese un nome de usuario para acceder a esta máquina." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Requírese un contrasinal para acceder a esta máquina." +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Non se puido obter unha captura de pantalla da conexión." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimizar a xanela" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Gardar a captura de pantalla" -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Escalar" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Captura de pantalla de %s" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Só de lectura" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Erro ao gardar a captura" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Facer unha captura de pantalla" +#: ../vinagre/vinagre-tube-handler.c:232 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Foi imposíbel obter a propiedade do servizo: %s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Enviar Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:289 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Resultou imposíbel crear a conexión: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Nome do escritorio:" +#: ../vinagre/vinagre-tube-handler.c:328 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Imposíbel aceptar a canle de fluxo: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Porto:" +#: ../vinagre/vinagre-tube-handler.c:404 +#, c-format +msgid "Failed to request name: %s" +msgstr "Produciuse un fallo ao solicitar o nome: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensións:" +#: ../vinagre/vinagre-tube-handler.c:405 +msgid "No error given" +msgstr "Non se produciu erro" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Non se puido obter unha captura de pantalla da conexión." +#: ../vinagre/vinagre-tube-handler.c:482 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Foi imposíbel obter o nome do contacto: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:517 #, c-format -msgid "Screenshot of %s" -msgstr "Captura de pantalla de %s" +msgid "Impossible to get the avatar: %s" +msgstr "Foi imposíbel obter o avatar: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Gardar a captura de pantalla" +#: ../vinagre/vinagre-tube-handler.c:538 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s quere compartir o seu escritorio con vostede." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"O escalado non se soporta nesta instalación.\n" -"\n" -"Lea o ficheiro README (distribuído co Vinagre) para saber como activar esta " -"característica." +#: ../vinagre/vinagre-tube-handler.c:543 +msgid "Desktop sharing invitation" +msgstr "Invitación para compatir o escritorio" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Máquina" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Editar" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Ver" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Conectarse a unha máquina remota" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Abrir un ficheiro .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Saír do programa" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" -msgstr "Editar as preferencias da aplicación" +msgstr "Editar as preferencias do aplicativo" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Abrir un marcador" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Conectarse a esta máquina" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Editar marcador" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Editar os detalles do marcador seleccionado" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Eliminar dos marcadores" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Eliminar dos marcadores a conexión seleccionada neste momento" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "Cartafol _novo" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Crear un cartafol novo" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Contidos" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" -msgstr "Abrir o manual do Vinagre" +msgstr "Abrir o manual do vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" -msgstr "Sobre esta aplicación" +msgstr "Sobre este aplicativo" + +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Barra de ferramen_tas" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Mostrar ou ocultar a barra de ferramentas" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Barra de _estado" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Mostrar ou ocultar a barra de estado" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Panel lateral" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Mostrar ou ocultar o panel lateral" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Pechar a conexión actual" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Pechar todos" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Pechar todas as conexións activas" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Engadir aos marcadores" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Engadir a conexión actual aos marcadores" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Facer unha captura de pantalla" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Facer unha captura de pantalla da conexión activa" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Enviar Ctrl+Alt+Del para activar a conexión" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Visualizar a máquina actual no modo de pantalla completa" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Tamaño _orixinal" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Axustar a xanela ao tamaño do escritorio remoto" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "E_scalar" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Axustar a pantalla remota ao tamaño da xanela actual" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Só de lectura" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Desactivar o rato e o teclado" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Barra de ferramen_tas" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Mostrar ou ocultar a barra de ferramentas" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Barra de _estado" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Mostrar ou ocultar a barra de estado" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_Panel lateral" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Mostrar ou ocultar o panel lateral" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Ocorreu un erro:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Non se puido cargar o ficheiro construtor: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" msgstr "O Vinagre é un cliente VNC para o escritorio Gnome" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -764,7 +997,7 @@ "Foundation, tanto na versión 2 da licenza como (segundo o seu criterio) en " "calquera versión posterior." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -772,10 +1005,10 @@ "details." msgstr "" "O Vinagre distribúese esperando que sexa útil mais SEN NINGUNHA GARANTÍA, " -"nin sequera a garantía implícita de COMERCIALIZACIÓN ou ADECUACIÓN A UN FIN " -"ESPECÍFICO. Para máis detalles vexa a Licenza pública xeral GNU." +"nin sequera a garantía implícita de VALOR COMERCIAL ou ADECUACIÓN PARA UN " +"FIN ESPECÍFICO. Para máis detalles vexa a Licenza pública xeral GNU." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -783,99 +1016,27 @@ "Debeu recibir unha copia da Licenza pública xeral GNU xunto con este " "programa. Se non é así, vexa ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" -msgstr "Suso Baleato " +msgstr "" +"Suso Baleato , 2009;\n" +"Antón Méixome , 2009." -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Sitio web do Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Non foi posíbel combinar vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "Conexións _recentes" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Abrir %s:%d" - -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Prema Ctrl+Alt para soltar o cursor" - -#~ msgid "Editing a bookmark" -#~ msgstr "Editar un marcador" - -#~ msgid "Enter a name for this connection" -#~ msgstr "Introducir un nome para esta conexión" - -#~ msgid "" -#~ "In order to connect on this machine, a password is required. Please, " -#~ "supply it." -#~ msgstr "" -#~ "Requírese un contrasinal para conectarse con esta máquina. Introduza o " -#~ "contrasinal." - -#~ msgid "Editing a bookmark" -#~ msgstr "Editando un marcador" - -#~ msgid "Saving to bookmarks" -#~ msgstr "Gardando en marcadores" - -#~ msgid "_Port:" -#~ msgstr "_Porto:" - -#~ msgid "_Remember this password" -#~ msgstr "_Recordar este contrasinal" - -#~ msgid "Confirm removal?" -#~ msgstr "Confirma a eliminación?" - -#~ msgid "Are you sure you want to exclude %s from bookmarks?" -#~ msgstr "Está seguro de que quere excluír %s dos marcadores?" - -#~ msgid "Error while removing %s from bookmarks: %s" -#~ msgstr "Houbo un erro ao eliminar %s dos marcadores: %s" - -#~ msgid "Image" -#~ msgstr "Imaxe" - -#~ msgid "Name" -#~ msgstr "Nome" - -#~ msgid "Hide bookmarks" -#~ msgstr "Ocultar os marcadores" - -#~ msgid "Connection to host \"%s\" was closed." -#~ msgstr "Pechouse a conexión co host \"%s\"." - -#~ msgid "Expected `%s' got `%s' for key %s" -#~ msgstr "Esperábase `%s' obtívose `%s' para a chave %s" - -#~ msgid "Authentication to host \"%s\" has failed" -#~ msgstr "Fallou a autenticación para o host \"%s\"" - -#~ msgid "Authentication method to host \"%s\" is unsupported. (%u)" -#~ msgstr "Non se soporta o método de autenticación para o host \"%s\". (%u)" - -#~ msgid "Error saving the password on the keyring." -#~ msgstr "Erro ao gardar o contrasinal no anel de chaves." - -#~ msgid "Press Ctrl+Alt to grab the cursor" -#~ msgstr "Prema Ctrl+Alt para capturar o cursor" - -#~ msgid "Connect into a remote machine" -#~ msgstr "Conectar cunha máquina remota" - -#~ msgid "Connect into this machine" -#~ msgstr "Conectarse con esta máquina" - -#~ msgid "Show or hide the bookmarks panel" -#~ msgstr "Mostrar ou ocultar o panel dos marcadores" diff -Nru vinagre-2.26.1/po/gu.po vinagre-2.29.1/po/gu.po --- vinagre-2.26.1/po/gu.po 2009-03-17 00:19:13.000000000 +0000 +++ vinagre-2.29.1/po/gu.po 2009-08-28 17:21:05.000000000 +0100 @@ -1,14 +1,14 @@ -# translation of vinagre.HEAD.gu.po to Gujarati +# translation of vinagre.master.gu.po to Gujarati # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Sweta Kothari , 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: vinagre.HEAD.gu\n" +"Project-Id-Version: vinagre.master.gu\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-02-25 09:22+0000\n" -"PO-Revision-Date: 2009-03-12 14:40+0530\n" +"POT-Creation-Date: 2009-08-25 12:02+0000\n" +"PO-Revision-Date: 2009-08-28 14:32+0530\n" "Last-Translator: Sweta Kothari \n" "Language-Team: Gujarati\n" "MIME-Version: 1.0\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "વિશે (_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "મદદ (_H)" @@ -30,161 +30,176 @@ msgstr "દૂરસ્થ ડેસ્કટોપો માં પ્રવેશો" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "દૂરસ્થ ડેસ્કટોપ દર્શક" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "સત્તાધિકરણની જરૂરિયાત છે" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "જોડાણ વિકલ્પો" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "જોડાણ" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "ફોલ્ડર" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "ઇન્ટરફેસ" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "વિકલ્પો" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "મુખ્ય ફોલ્ડર" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "ક્યું મશીન ને તમે જોડવા માંગો છો?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "ઉપર બધા ક્ષેત્રો ફરજિયાત છે" +#: ../data/vinagre.ui.h:1 +#| msgid "All fields above are mandatory" +msgid "All fields above are mandatory" +msgstr "ઉપર બધા ક્ષેત્રો ફરજિયાત છે" + +#: ../data/vinagre.ui.h:2 +#| msgid "Authentication is required" +msgid "Authentication is required" +msgstr "સત્તાધિકરણની જરૂરિયાત છે" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "બુકમાર્કો" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +#| msgid "Connecting..." +msgid "Connection" +msgstr "જોડાણ" + +#: ../data/vinagre.ui.h:5 +#| msgid "Connection options" +msgid "Connection options" +msgstr "જોડાણ વિકલ્પો" + +#: ../data/vinagre.ui.h:6 +#| msgid "New Folder" +msgid "Folder" +msgstr "ફોલ્ડર" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "યજમાન:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +#| msgid "Interface" +msgid "Interface" +msgstr "ઇન્ટરફેસ" + +#: ../data/vinagre.ui.h:9 +#| msgid "Options" +msgid "Options" +msgstr "વિકલ્પો" + +#: ../data/vinagre.ui.h:10 +#| msgid "Parent Folder" +msgid "Parent Folder" +msgstr "મુખ્ય ફોલ્ડર" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "પસંદગીઓ" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "ક્યાંતો જ્યારે ફક્ત એક સક્રિય જોડાણ હોય ત્યારે આપણે ટેબોને બતાવવુ જોઇએ" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "ક્યાંતો આપણે મેનુ એક્સેલેટરો (શોર્ટકટ કીઓ) બતાવેલ હોવી જોઇએ" +#: ../data/vinagre.ui.h:12 +#| msgid "Which machine do you want to connect to?" +msgid "Which machine do you want to connect to?" +msgstr "ક્યું મશીન ને તમે જોડવા માંગો છો?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "હંમેશા ટેબોને બતાવો (_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "સત્તાધિકાર (_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "સંપૂર્ણ સ્ક્રીન (_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "યજમાન (_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "નામ (_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "પાસવર્ડ (_P):" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "પ્રોટોકોલ (_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "આ ઓળખપત્રને યાદ રાખો (_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "માપ કરી રહ્યા છે (_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "મેનુ ટૂંકાણોને બતાવો (_S)" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "વપરાશકર્તા નામ (_U):" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "ફક્ત દેખાવ (_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "પ્લગઇનોને સક્રિય કરો" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "યજમાન અથવા યજમાન:દેખાવ અથવા યજમાન::પોર્ટ" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"સક્રિય પ્લગઇનોની યાદી. તે સક્રિય પ્લગઇનોનાં \"Location\" ને સમાવે છે. " +"આપેલ પલ્ગઇનનાં \"Location\" ને મેળવવા માટે .vinagre-plugin ફાઇલને જુઓ." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "જોડાણ સંવાદમાં ઇતિહાસ વસ્તુઓનાં મહત્તમ નંબર" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " "and will not be sent to the remote host." msgstr "" -"મેનુ શોર્ટકટો ને નિષ્ક્રિય કરવા માટે \"false\" ને સુયોજિત કરો. તેઓને સક્રિય કરવા માટે \"true\" " -"ને સુયોજિત કરો. નોંધો કે જે જો તેઓ સક્રિય થયેલ હોય તો. પેલી કીઓ મેનુ દ્દારા અલગ થયેલ હશે " -"અને દૂરસ્થ યજમાનમાં મોકલાયેલ હશે નહિં." +"મેનુ શોર્ટકટો ને નિષ્ક્રિય કરવા માટે \"false\" ને સુયોજિત કરો. તેઓને સક્રિય કરવા માટે " +"\"true\" ને સુયોજિત કરો. નોંધો કે જે જો તેઓ સક્રિય થયેલ હોય તો. પેલી કીઓ મેનુ દ્દારા અલગ " +"થયેલ હશે અને દૂરસ્થ યજમાનમાં મોકલાયેલ હશે નહિં." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." msgstr "" -"ટેબો ને હંમેશા બતાવવા માટે \"true\" ને સુયોજિત કરો. જ્યારે એક કરતા વધારે જોડાણ હોય ત્યારે ટેબો ને " -"ફક્ત બતાવવા માટે \"false\" ને સુયોજિત કરો." +"ટેબો ને હંમેશા બતાવવા માટે \"true\" ને સુયોજિત કરો. જ્યારે એક કરતા વધારે જોડાણ હોય " +"ત્યારે ટેબો ને ફક્ત બતાવવા માટે \"false\" ને સુયોજિત કરો." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "યજમાન ડ્રોપડાઉન પ્રવેશમાં વસ્તુઓનાં મહત્તમ નંબરને સ્પષ્ટ કરો." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" URLs માટે સંભાળનાર" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " "to share the desktop with the other clients." msgstr "" -"જ્યારે યજમાન સાથે જોડી રહ્યા હોય ત્યારે, ક્લાઇન્ટ એ જોડાયલ બીજા ક્લાઇન્ટો અથવા હાલનાં જોડાણો ને " -"છોડી દેવા સર્વર ને કહે છે. બીજા ક્લાઇન્ટો સાથે ડેસ્કટોપને વહેંચણી કરવા માટે true ની કિંમત ને સુયોજિત કરો." +"જ્યારે યજમાન સાથે જોડી રહ્યા હોય ત્યારે, ક્લાઇન્ટ એ જોડાયલ બીજા ક્લાઇન્ટો અથવા હાલનાં " +"જોડાણો ને છોડી દેવા સર્વર ને કહે છે. બીજા ક્લાઇન્ટો સાથે ડેસ્કટોપને વહેંચણી કરવા માટે true " +"ની કિંમત ને સુયોજિત કરો." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "ક્યાંતો આપણે બીજા ક્લાઇન્ટોનાં જોડાણ ને છોડી દેવુ જોઇએ" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "ક્યાંતો જ્યારે ફક્ત એક સક્રિય જોડાણ હોય ત્યારે આપણે ટેબોને બતાવવુ જોઇએ" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "ક્યાંતો આપણે મેનુ એક્સેલેટરો (શોર્ટકટ કીઓ) બતાવેલ હોવી જોઇએ" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "દૂરસ્થ ડેસ્કટોપ (VNC) ફાઇલ" @@ -193,530 +208,763 @@ msgid "Remote Desktop Connection" msgstr "દૂરસ્થ ડેસ્કટોપ જોડાણ" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux ટર્મિનલોમાં પ્રવેશો" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "પોર્ટ:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH આધાર" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "'વહેંચાયેલ' ફ્લેગ માટે ખરાબ કિંમત: %d. તે ૦ અથવા ૧ થી ધારેલ છે. તેને અવગણી રહ્યા છે." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "માપ થયેલ પરિસ્થિતિને સક્રિય કરો" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC વિકલ્પો:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC વિકલ્પોને બતાવો" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows અને બીજા મશીનોમાં પ્રવેશો." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "ફાઇલ નું પદચ્છેદન કરી શકાયુ નહિં." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "ફાઇલ VNC નથી: જૂથ \"connection\" ગુમ થયેલ છે." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "ફાઇલ VNC નથી: કી \"host\" ગુમ થયેલ છે." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC વિકલ્પો" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "ફક્ત દેખાવ (_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "માપ કરી રહ્યા છે (_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC ફાઇલો" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "ડેસ્કટોપ નામ:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "પરિમાણો:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "યજમાનને જોડાણમાં ભૂલ." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +#| msgid "Authentication method to host %s is unsupported. (%u)" +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "યજમાન %s ની સત્તાધિકરણ પદ્દતિ એ આધારભૂત નથી. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "સત્તાધિકરણ આધારભૂત નથી" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "સત્તાધિકરણ ભૂલ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "આ મશીનમાં પ્રવેશ કરવા માટે ક્રમમાં વપરાશકર્તાની જરૂરિયાત છે." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "આ મશીનમાં પ્રવેશવા માટે ક્રમમાં પાસવર્ડ ની જરૂરિયાત છે." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "માપ કરી રહ્યા છે (_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +#| msgid "Fit the remote screen into the current window size" +msgid "Fits the remote screen into the current window size" +msgstr "હાલની વિન્ડો માપમાં દૂરસ્થ સ્ક્રીનને બંધબેસાડો" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +#| msgid "Disable mouse and keyboard" +msgid "Does not send mouse and keyboard events" +msgstr "માઉસ અને કિબોર્ડ ઘટનાઓને મોકલો નહિં" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "મૂળભૂત માપ (_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "દૂરસ્થ ડેસ્કટોપ નાં માપની વિન્ડો ને ગોઠવો" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del મોકલો" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +#| msgid "Send Ctrl+Alt+Del to active connection" +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "દૂરસ્થ મશીનમાં Ctrl+Alt+Del ને મોકલે છે" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "માપ કરી રહ્યા છે" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "ફક્ત વાંચો" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"માપ એ આ સ્થાપન પર આધારભૂત નતી.\n" +"\n" +"આ ગુણધર્મ ને કેવી રીતે સક્રિય કરાય તેને જાણવા માટે ક્રમમાં README ફાઇલ (Vinagre સાથે લઇ " +"જવાયેલ) ને વાંચો." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC આધાર" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "દૂરસ્થ મશીનો માં તરત જ પ્રવેશવા માટે મેનુ" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre એપલેટ ફેક્ટરી" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "vinagre ને ચલાવી શકાયુ નહિં:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "દૂરસ્થ ડેસ્કટોપ દર્શક ને ખોલો" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "તમારા બુકમાર્કો માં પ્રવેશો" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "પ્રોટોકોલ %s આધારભૂત નથી." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "જ્યારે બુકમાર્કોની શરૂઆત કરી રહ્યા હોય ત્યારે ભૂલ: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "અજ્ઞાત ભૂલ" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "જ્યારે બુકમાર્કોની શરૂઆત કરી રહ્યા હોય ત્યારે ભૂલ: ફાઇલ એ એવુ લાગે છે કે ખાલી છે" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "જ્યારે બુકમાર્કો ને શરૂ કરી રહ્યા હોય ત્યારે ભૂલ: ફાઇલ એ vinagre બુકમાર્કો ફાઇલ નથી" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "બુકમાર્કો ને સંગ્રહ કરવા દરમ્યાન ભૂલ: XML બંધારણ ને બનાવવા માટે નિષ્ફળતા" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "બુકમાર્કો ને સંગ્રહ કરવા દરમ્યાન ભૂલ: XML બંધારણને શરૂ કરવામાં નિષ્ફળતા" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "બુકમાર્કો ને સંગ્રહ કરવા દરમ્યાન ભૂલ: XML બંધારણ ને આખરી રૂપ આપવામાં નિષ્ફળતા" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "જ્યારે બુકમાર્કો ને સંગ્રહ કરવા દરમ્યાન ભૂલ: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "બુકમાર્કો ને સ્થળાંતર કરવા દરમ્યાન ભૂલ: XML બંધારણ ને બનાવવામાં નિષ્ફળતા" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "જ્યારે બુકમાર્કો ને સ્થળાંતર કરી રહ્યા હોય ત્યારે ભૂલ: XML બંધારણ ને શરૂ કરવામાં નિષ્ફળતા" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "જ્યારે બુકમાર્કો ને સ્થળાંતર કરી રહ્યા હોય ત્યારે ભૂલ: XML બંધારણ ને આખરી રૂપ આપવામાં " "નિષ્ફળતા" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "જ્યારે બુકમાર્કો ને સ્થળાંતર કરવા દરમ્યાન ભૂલ: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +#| msgid "Error while migrating bookmarks: %s" +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "જ્યારે બુકમાર્કો ને સ્થળાંતર કરવા દરમ્યાન ભૂલ: VNC પ્લગઇન સક્રિય થયેલ નથી" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "ડિરેક્ટરીને બનાવવામાં નિષ્ફળતા" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." -msgstr "નવા બંધારણ માં બુકમાર્કો ફાઇલને પરિવહન કરી રહ્યા છે. આ ક્રિયા ફક્ત એકવાર ચલાવવા માટે ધારેલ છે." +msgstr "" +"નવા બંધારણ માં બુકમાર્કો ફાઇલને પરિવહન કરી રહ્યા છે. આ ક્રિયા ફક્ત એકવાર ચલાવવા માટે " +"ધારેલ છે." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "જૂની બુકમાર્કો ફાઇલને ખોલવા દરમ્યાન ભૂલ: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "સ્થળાંતર રદ કરેલ છે" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "જૂની બુકમાર્કો ફાઇલને દૂર કરી શકાઇ નહિં" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "રુટ ફોલ્ડર" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "આ ફોલ્ડર માટે અયોગ્ય નામ" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "નામ \"%s\" એ પહેલેથી આ ફોલ્ડરમાં વપરાયેલ છે. મહેરબાની કરીને વિવિધ નામને વાપરો." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +#| msgid "Invalid name for this folder" +msgid "Invalid name for this item" +msgstr "આ વસ્તુ માટે અયોગ્ય નામ" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "શું તમે ખરેખર બુકમાર્કો માંથી %s ને દૂર કરવા માંગો છો?" +msgid "(Protocol: %s)" +msgstr "(પ્રોટોકોલ: %s)" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +#| msgid "Are you sure you want to remove %s from bookmarks?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "શું તમે ખરેખર બુકમાર્કો માંથી %s ને દૂર કરવા માંગો છો?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "ફોલ્ડરને દૂર કરો?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "સૂચના કે જે બધા તેના ઉપફોલ્ડરો અને વસ્તુઓ ને તેની સાથે સાથએ દૂર કરેલ હશે." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "વસ્તુને દૂર કરો?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "બુકમાર્ક ને દૂર કરવા દરમ્યાન ભૂલ: પ્રવેશ શોધાયો નથી" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "નવુ ફોલ્ડર" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "ફાઇલ પસંદ કરો" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "આધારભૂત બંધારણો" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "આધારભૂત ફાઇલો કંઇ નથી" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "ખોલવા માટે કોઇ પણ સક્રિય પ્લગઇન આધારભૂત ફાઇલની માંગણી કરતા નથી. અમુક પ્લગઇનોને સક્રિય કરો અને ફરીથી પ્રયત્ન કરો." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "નીચેની ફાઇલ ને ખોલી શકાઇ નહિં:" msgstr[1] "નીચેની ફાઇલો ને ખોલી શકાઇ નહિં:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "પ્રોટોકોલ યાદીમાં સક્રિય પ્રોટોકોલને મેળવી શકાયુ નહિં." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "જ્યારે ઇતિહાસ ફાઇલ ને સંગ્રહ કરવા દરમ્યાન ભૂલ: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "VNC સર્વર પસંદ કરો" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "પ્રોટોકોલ %s આધારભૂત નથી." +#: ../vinagre/vinagre-connect.c:340 +#| msgid "Open Remote Desktop Viewer" +msgid "Choose a Remote Desktop" +msgstr "દૂરસ્થ ડેસ્કટોપ ને પસંદ કરો" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "ફાઇલ ને ખોલી શકાઇ નહિં." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "ફાઇલ નું પદચ્છેદન કરી શકાયુ નહિં." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "'વહેંચાયેલ' ફ્લેગ માટે ખરાબ કિંમત: %d. તે ૦ અથવા ૧ થી ધારેલ છે. તેને અવગણી રહ્યા છે." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "ફાઇલમાં યજમાન સરનામું શોધી શકાયુ નહિં." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "પ્લગઇનોનાં કોઇપણ દ્દારા ફાઇલ ઓળખાયેલ નથી." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "અયોગ્ય ક્રિયા" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "drag&drop ક્રિયા માંથી મળેલ માહિતી એ અયોગ્ય છે." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "યજમાનો નજીકમાં" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr ".vnc ફાઇલ નો ખોલો" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "સંપૂર્ણ સ્ક્રીનમાં vinagre ખોલો" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "ફાઇલનું નામ" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "vinagre ની હાલનાં ઉદાહરણમાં નવી ઊંચા સ્તરની વિન્ડો ને બનાવો" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "vinagre દ્દારા ઓળખાયેલ ફાઇલને ખોલો" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "ફાઇલનું નામ" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "નીચેની ભૂલ ઉત્પન્ન થયેલ હતી:" msgstr[1] "નીચેની ભૂલો ઉત્પન્ન થયેલ હતી:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "GNOME માટે - VNC ક્લાઇન્ટ" +#: ../vinagre/vinagre-main.c:169 +#| msgid "Remote Desktop Viewer" +msgid "- Remote Desktop Viewer" +msgstr "- દૂરસ્થ ડેસ્કટોપ દર્શક" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "ઉપલ્બધ આદેશ વાક્ય વિકલ્પો ની સંપૂર્ણ યાદી ને જોવા માટે 'vinagre --help' ને ચલાવો" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "avahi યજમાન નામ ને સુધારવામાં નિષ્ફળતા: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "પ્લગઇન %s એ સેવા %s માટે બ્રાઉઝર પહેલેથી જ રજીસ્ટર થયેલ છે." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to add mDNS browser for service %s." +msgstr "સેવા %s માટે mDNS બ્રાઉઝરને ઉમેરવામાં નિષ્ફળતા." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "યજમાનો માટે બ્રાઉઝ કરવામાં નિષ્ફળતા: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS બ્રાઉઝર ને પ્રારંભ કરવામાં નિષ્ફળતા: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "યજમાન %s નું જોડાણ બંધ હતુ." +#| msgid "Connection to host %s was closed." +msgid "Connection to host %s was closed." +msgstr "યજમાન %s નું જોડાણ બંધ હતુ." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "જોડાણ બંધ થયેલ છે" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +#| msgid "Authentication to host %s has failed" +msgid "Authentication to host %s has failed" +msgstr "યજમાન %s નું સત્તાધિકરણ નિષ્ફળ હતુ" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "સત્તાધિકરણ નિષ્ફળ" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "જોડાઇ રહ્યા છે..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "જોડાણ બંધ કરો" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "પ્લગઇન વ્યવસ્થાપક" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "પ્લગઇન" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "સક્રિય થયેલ" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "રૂપરેખાંકિત કરો (_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "સક્રિય કરો (_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "બધાને સક્રિય કરો (_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "બધાને નિષ્ક્રિય કરો (_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +#| msgid "_About" +msgid "_About Plugin" +msgstr "પ્લગઇન વિશે (_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "પ્લગઇનને રૂપરેખાંકિત કરો (_o)" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "વ્યવસ્થાપકની પસંદગીઓને શરૂ કરી શકાતી નથી." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "યજમાનને જોડાણમાં ભૂલ." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "યજમાન %s નું સત્તાધિકરણ નિષ્ફળ હતુ" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "સત્તાધિકરણ નિષ્ફળ" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "યજમાન %s ની સત્તાધિકરણ પદ્દતિ એ આધારભૂત નથી. (%u)" +#: ../vinagre/vinagre-tab.c:346 +#| msgid "_Full screen" +msgid "Leave fullscreen" +msgstr "સંપૂર્ણ સ્ક્રીન ને છોડો" -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "સત્તાધિકરણ આધારભૂત નથી" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "તાજેતરનાં જોડાણને સંગ્રહ કરવા દરમ્યાન ભૂલ." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +#| msgid "Error saving the credential on the keyring." +msgid "Error saving the credentials on the keyring." msgstr "કિરીંગ પર ઓળખપત્ર ને સંગ્રહ કરવા દરમ્યાન ભૂલ." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "સત્તાધિકરણ ભૂલ" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "આ મશીનમાં પ્રવેશ કરવા માટે ક્રમમાં વપરાશકર્તાની જરૂરિયાત છે." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "આ મશીનમાં પ્રવેશવા માટે ક્રમમાં પાસવર્ડ ની જરૂરિયાત છે." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "વિન્ડો ને નાની કરો" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "માપ કરી રહ્યા છે" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "જોડાણનાં સ્ક્રીનશોટને મેળવી શકાયુ નહિં." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "ફક્ત વાંચો" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "સ્ક્રીનશોટ નો સંગ્રહ કરો" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "સ્ક્રીનશોટ લો" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s નો સ્ક્રીનશોટ" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del મોકલો" +#: ../vinagre/vinagre-tab.c:881 +#| msgid "Error saving recent connection." +msgid "Error saving screenshot" +msgstr "સ્ક્રીનશોટ ને સંગ્રહ કરતી વખતે ભૂલ" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "ડેસ્કટોપ નામ:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "સેવા ગુણધર્મ ને મેળવવાનું અશકય: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "પોર્ટ:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +#| msgid "Failed to create the directory" +msgid "Impossible to create the connection: %s" +msgstr "જોડાણ બનાવવાનું અશક્ય: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "પરિમાણો:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "સ્ટ્રીમ ટ્યુબ ને સ્વીકારવાનું અશક્ય: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "જોડાણનાં સ્ક્રીનશોટને મેળવી શકાયુ નહિં." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "સંપર્ક નામ ને મેળવવાનું અશક્ય: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s નો સ્ક્રીનશોટ" +msgid "Impossible to get the avatar: %s" +msgstr "અવતાર ને મેળવવાનું અશક્ય: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "સ્ક્રીનશોટ નો સંગ્રહ કરો" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s એ તમારી સાથે તેની ડેસ્કટોપને વહેંચવાનું ઇચ્છે છે." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"માપ એ આ સ્થાપન પર આધારભૂત નતી.\n" -"\n" -"આ ગુણધર્મ ને કેવી રીતે સક્રિય કરાય તેને જાણવા માટે ક્રમમાં README ફાઇલ (Vinagre સાથે લઇ જવાયેલ) ને વાંચો." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "ડેસ્કટોપ વહેંચણી આમંત્રણ" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "મશીન (_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "ફેરફાર કરો (_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "દેખાવ (_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "બુકમાર્કો (_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "દૂરસ્થ મશીન માં જોડાવો" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr ".VNC ફાઇલ ને ખોલો" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "પ્રક્રિયામાંથી બહાર નીકળો" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "કાર્યક્રમ પસંદગીઓમાં ફેરફાર કરો" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "બુકમાર્ક ખોલો (_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "આ મશીનને જોડો" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "બુકમાર્કમાં ફેરફાર કરો (_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "પસંદ થયેલ બુકમાર્કની વિગતોમાં ફેરફાર કરો" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "બુકમાર્કો માંથી દૂર કરો (_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "બુકમાર્કો માંથી હાલનાં પસંદ થયેલ જોડાણ ને દૂર કરો" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "નવુ ફોલ્ડર (_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "નવા ફોલ્ડરને બનાવો" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "સમાવિષ્ટો (_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "vinagre પુસ્તિકા ને ખોલો" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "આ કાર્યક્રમ વિશે" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "સાધનપટ્ટી (_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "સાધનપટ્ટીને બતાવો અથવા છુપાડો" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "પરિસ્થિતિ પટ્ટી (_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "પરિસ્થિતિ પટ્ટીને બતાવો અથવા છુપાડો" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "બાજુ ની પેનલ (_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "બાજુની પેનલને બતાવો અથવા છુપાડો" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "હાલનું જોડાણ બંધ કરો" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "બધુ બંધ કરો (_l)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "બધા સક્રિય જોડાણોને બંધ કરો" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "બુકમાર્કોમાં ઉમેરો (_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "તમારા બુકમાર્કો માં હાલનાં જોડાણ ને ઉમેરો" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "સ્ક્રીનશોટ લો" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "સક્રિય જોડાણનાં સ્ક્રીનશોટને લો" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "જોડાણ ને સક્રિય કરવા માટે Ctrl+Alt+Del ને મોકલો" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "સંપૂર્ણ સ્ક્રીન માં હાલનાં મશીનને દર્શાવો" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "મૂળભૂત માપ (_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "દૂરસ્થ ડેસ્કટોપ નાં માપની વિન્ડો ને ગોઠવો" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "માપ કરી રહ્યા છે (_c)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "હાલની વિન્ડો માપ માં દૂરસ્થ સ્ક્રીન ને બંધબેસાડો" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "ફક્ત વાંચવાનું (_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "માઉસ અને કિબોર્ડ ને નિષ્ક્રિય કરો" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "સાધનપટ્ટી (_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "સાધનપટ્ટીને બતાવો અથવા છુપાડો" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "પરિસ્થિતિ પટ્ટી (_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "પરિસ્થિતિ પટ્ટીને બતાવો અથવા છુપાડો" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "બાજુ ની પેનલ (_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "બાજુની પેનલને બતાવો અથવા છુપાડો" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "ભૂલ ઉત્પન્ન થયેલ હતી:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre એ GNOME ડેસ્કટોપ માટે VNC ક્લાઇન્ટ છે" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +#| msgid "Could not open the file." +msgid "Could not load builder file: %s" +msgstr "બિલ્ડર ફાઇલને લોડ કરી શકાઇ નહિં: %s" + +#: ../vinagre/vinagre-utils.c:453 +#| msgid "Vinagre is a VNC client for the GNOME Desktop" +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "GNOME ડેસ્કટોપ માટે Vinagre એ દૂરસ્થ ડેસ્કટોપ દર્શક છે" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -728,7 +976,7 @@ "Foundation; either version 2 of the License, or (at your option) any later " "version." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -740,7 +988,7 @@ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -748,30 +996,26 @@ "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" -msgstr "શ્ર્વેતા કોઠારી , શ્ર્વેતા કોઠારી " +msgstr "શ્ર્વેતા કોઠારી " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre વેબસાઇટ" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml ને ભેગુ કરી શકાયુ નહિં: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "તાજેતરનાં જોડાણો (_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "ખોલો %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "કર્સર ને મુક્ત કરવામાં Ctrl+Alt ને દબાવો" - diff -Nru vinagre-2.26.1/po/he.po vinagre-2.29.1/po/he.po --- vinagre-2.26.1/po/he.po 2009-04-13 14:28:57.000000000 +0100 +++ vinagre-2.29.1/po/he.po 2009-07-07 16:36:25.000000000 +0100 @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: 1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-20 20:31+0000\n" -"PO-Revision-Date: 2009-04-09 00:02+0200\n" +"POT-Creation-Date: 2009-06-04 15:04+0000\n" +"PO-Revision-Date: 2009-07-04 23:00+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: he\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-Poedit-Language: Hebrew\n" #: ../data/GNOME_VinagreApplet.xml.h:1 msgid "_About" @@ -82,7 +83,7 @@ #: ../data/vinagre.glade.h:11 #: ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../src/vinagre-vnc-tab.c:132 msgid "Host:" msgstr "מארח:" @@ -142,6 +143,7 @@ msgstr "_שם משתמש:" #: ../data/vinagre.glade.h:26 +#: ../src/vinagre-vnc-tab.c:643 msgid "_View only" msgstr "_תצוגה בלבד" @@ -208,46 +210,46 @@ msgid "Access your bookmarks" msgstr "גש לסימניות שלך" -#: ../src/vinagre-bookmarks.c:344 +#: ../src/vinagre-bookmarks.c:327 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "שגיאה באתחול הסימניות: %s" -#: ../src/vinagre-bookmarks.c:344 -#: ../src/vinagre-bookmarks.c:459 +#: ../src/vinagre-bookmarks.c:327 +#: ../src/vinagre-bookmarks.c:442 #: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-commands.c:145 +#: ../src/vinagre-commands.c:148 #: ../src/vinagre-connect.c:277 #: ../src/vinagre-fav.c:678 #: ../src/vinagre-main.c:85 #: ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../src/vinagre-window.c:263 msgid "Unknown error" msgstr "שגיאה לא ידועה" -#: ../src/vinagre-bookmarks.c:351 +#: ../src/vinagre-bookmarks.c:334 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "שגיאה באתחול הסימניות: נראה שהקובץ ריק" -#: ../src/vinagre-bookmarks.c:358 +#: ../src/vinagre-bookmarks.c:341 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "שגיאה באתחול הסימניות: הקובץ אינו קובץ סימניות של vinagre" -#: ../src/vinagre-bookmarks.c:420 -#: ../src/vinagre-bookmarks.c:427 +#: ../src/vinagre-bookmarks.c:403 +#: ../src/vinagre-bookmarks.c:410 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "שגיאה בשמירת הסימניות: נכשל ביצירת מבנה ה־XML" -#: ../src/vinagre-bookmarks.c:434 -#: ../src/vinagre-bookmarks.c:441 +#: ../src/vinagre-bookmarks.c:417 +#: ../src/vinagre-bookmarks.c:424 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "שגיאה בשמירת הסימניות: נכשל באתחול מבנה ה־XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../src/vinagre-bookmarks.c:433 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "שגיאה בשמירת הסימניות: נכשל בסיום מבנה ה־XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../src/vinagre-bookmarks.c:442 #, c-format msgid "Error while saving bookmarks: %s" msgstr "שגיאה בשמירת הסימניות: %s" @@ -303,53 +305,52 @@ msgstr "שם שגוי עבור תיקייה זאת" #: ../src/vinagre-bookmarks-ui.c:89 -#: ../src/vinagre-bookmarks-ui.c:191 +#: ../src/vinagre-bookmarks-ui.c:194 #, c-format msgid "The name \"%s\" is already used in this folder. Please use a different name." msgstr "השם \"%s\" כבר נמצא בשימוש בתיקייה זו. אנא השתמש בשם אחר." #: ../src/vinagre-bookmarks-ui.c:90 -#: ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 -#| msgid "Invalid name for this folder" +#: ../src/vinagre-bookmarks-ui.c:184 +#: ../src/vinagre-bookmarks-ui.c:195 msgid "Invalid name for this item" msgstr "שם לא תקין עבור פריט זה" -#: ../src/vinagre-bookmarks-ui.c:292 +#: ../src/vinagre-bookmarks-ui.c:298 #, c-format msgid "Are you sure you want to remove %s from bookmarks?" msgstr "להסיר את %s מהסימניות?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../src/vinagre-bookmarks-ui.c:303 msgid "Remove Folder?" msgstr "להסיר את התיקייה?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../src/vinagre-bookmarks-ui.c:304 msgid "Notice that all its subfolders and items will be removed as well." msgstr "שים לב שכל תת־התיקיות והפריטים שלה יוסרו גם הם." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../src/vinagre-bookmarks-ui.c:309 msgid "Remove Item?" msgstr "להסיר את הפריט" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../src/vinagre-bookmarks-ui.c:326 msgid "Error removing bookmark: Entry not found" msgstr "שגיאה בהסרת הסימנייה: הסימנייה לא נמצאה" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../src/vinagre-bookmarks-ui.c:343 msgid "New Folder" msgstr "תיקייה חדשה" -#: ../src/vinagre-commands.c:113 +#: ../src/vinagre-commands.c:115 msgid "Choose the file" msgstr "בחר את הקובץ" -#: ../src/vinagre-commands.c:124 -#: ../src/vinagre-tab.c:1152 +#: ../src/vinagre-commands.c:126 +#: ../src/vinagre-tab.c:703 msgid "Supported formats" msgstr "תצורות נתמכות" -#: ../src/vinagre-commands.c:156 +#: ../src/vinagre-commands.c:159 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "לא ניתן לפתוח את הקובץ הבא:" @@ -364,25 +365,20 @@ msgid "Choose a VNC Server" msgstr "בחר שרת VNC" -#: ../src/vinagre-connection.c:601 +#: ../src/vinagre-connection.c:556 #, c-format msgid "The protocol %s is not supported." msgstr "הפרוטוקול %s אינו נתמך." -#: ../src/vinagre-connection.c:708 +#: ../src/vinagre-connection.c:669 msgid "Could not open the file." msgstr "לא ניתן לפתוח את הקובץ." -#: ../src/vinagre-connection.c:727 +#: ../src/vinagre-connection.c:688 msgid "Could not parse the file." msgstr "לא ניתן לפרק את הקובץ." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." - -#: ../src/vinagre-connection.c:778 +#: ../src/vinagre-connection.c:733 msgid "Could not find the host address in the file." msgstr "כתובת המארח לא נמצאה בקובץ." @@ -440,21 +436,30 @@ msgid "Failed to browse for hosts: %s\n" msgstr "נכשל בדפדוף עבור מארחים: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../src/vinagre-notebook.c:399 #, c-format msgid "Connection to host %s was closed." msgstr "החיבור למארח %s נסגר." -#: ../src/vinagre-notebook.c:170 +#: ../src/vinagre-notebook.c:401 msgid "Connection closed" msgstr "החיבור נסגר" -#: ../src/vinagre-notebook.c:194 +#: ../src/vinagre-notebook.c:417 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "אימות עם המארח %s נכשל" + +#: ../src/vinagre-notebook.c:423 +msgid "Authentication failed" +msgstr "האימות נכשל" + +#: ../src/vinagre-notebook.c:460 msgid "Connecting..." msgstr "מתחבר..." -#: ../src/vinagre-notebook.c:221 -#: ../src/vinagre-tab.c:878 +#: ../src/vinagre-notebook.c:487 +#: ../src/vinagre-tab.c:379 msgid "Close connection" msgstr "סגור חיבור" @@ -462,111 +467,39 @@ msgid "Cannot initialize preferences manager." msgstr "לא ניתן לאתחל את מנהל ההעדפות." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "שגיאה בחיבור למארח" - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "אימות עם המארח %s נכשל" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "האימות נכשל" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "שיטת האימות אל המארח %s אינה נתמכת. (%u)." - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "שיטת האימות לא נתמכת" - -#: ../src/vinagre-tab.c:460 +#: ../src/vinagre-tab.c:329 msgid "Error saving recent connection." msgstr "שגיאה בשמירת החיבור האחרון." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "שגיאה בשמירת פרטי הזיהוי במחזיק המפתחות." - -#: ../src/vinagre-tab.c:747 -#: ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "שגיאת אימות" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "נדרש שם משתמש לצורך גישה למכונה זאת." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "נדרשת סיסמה לצורך גישה למכונה זאת." - -#: ../src/vinagre-tab.c:891 +#: ../src/vinagre-tab.c:393 msgid "Minimize window" msgstr "הסתר חלון" -#: ../src/vinagre-tab.c:906 -#: ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "התאמה" - -#: ../src/vinagre-tab.c:916 -#: ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "קריאה בלבד" - #. Machine menu -#: ../src/vinagre-tab.c:927 -#: ../src/vinagre-tab.c:928 -#: ../src/vinagre-ui.h:85 +#: ../src/vinagre-tab.c:409 +#: ../src/vinagre-tab.c:410 +#: ../src/vinagre-ui.h:100 msgid "Take screenshot" msgstr "צלם תמונת מסך" -#: ../src/vinagre-tab.c:936 -#: ../src/vinagre-tab.c:937 -#: ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "שלח Ctrl-Alt-Del" - -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "שם שולחן עבודה:" - -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "שער:" - -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "מימדים:" +#: ../src/vinagre-tab.c:641 +#| msgid "Error saving the credential on the keyring." +msgid "Error saving the credentials on the keyring." +msgstr "שגיאה בשמירת פרטי הזיהוי במחזיק המפתחות." -#: ../src/vinagre-tab.c:1130 +#: ../src/vinagre-tab.c:681 msgid "Could not get a screenshot of the connection." msgstr "לא ניתן לקבל צילום מסך של החיבור." -#: ../src/vinagre-tab.c:1138 +#: ../src/vinagre-tab.c:689 #, c-format msgid "Screenshot of %s" msgstr "תמונת מסך של %s" -#: ../src/vinagre-tab.c:1141 +#: ../src/vinagre-tab.c:692 msgid "Save Screenshot" msgstr "שמור תמונת מסך" -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable this feature." -msgstr "" -"התאמה אינה נתמכת בהתקנה זאת.\n" -"\n" -"קרא את הקובץ README (המצורף ל־Vinagre) כדי לדעת איך להפעיל את תכונה זאת." - #. Toplevel #: ../src/vinagre-ui.h:33 msgid "_Machine" @@ -646,87 +579,59 @@ msgid "About this application" msgstr "אודות יישום זה" -#: ../src/vinagre-ui.h:72 +#: ../src/vinagre-ui.h:70 +msgid "_Toolbar" +msgstr "סרגל _כלים" + +#: ../src/vinagre-ui.h:71 +msgid "Show or hide the toolbar" +msgstr "הצג או הסתר את סרגל הכלים" + +#: ../src/vinagre-ui.h:74 +msgid "_Statusbar" +msgstr "שורת _מצב" + +#: ../src/vinagre-ui.h:75 +msgid "Show or hide the statusbar" +msgstr "הצג או הסתר את שורת המצב" + +#: ../src/vinagre-ui.h:78 +msgid "Side _Panel" +msgstr "_לוח צד" + +#: ../src/vinagre-ui.h:79 +msgid "Show or hide the side panel" +msgstr "הצג או הסתר את סרגל הצד" + +#: ../src/vinagre-ui.h:87 msgid "Close the current connection" msgstr "סגור את החיבור הנוכחי" -#: ../src/vinagre-ui.h:73 +#: ../src/vinagre-ui.h:88 msgid "C_lose All" msgstr "ס_גור הכל" -#: ../src/vinagre-ui.h:74 +#: ../src/vinagre-ui.h:89 msgid "Close all active connections" msgstr "סגור את כל החיבורים הפעילים" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../src/vinagre-ui.h:92 msgid "_Add to bookmarks" msgstr "_הוסף לסימניות" -#: ../src/vinagre-ui.h:78 +#: ../src/vinagre-ui.h:93 msgid "Add current connection to your bookmarks" msgstr "הוסף את החיבור הנוכחי לסימניות שלך" -#: ../src/vinagre-ui.h:86 +#: ../src/vinagre-ui.h:101 msgid "Take a screenshot of active connection" msgstr "צלם תמונת מסך מחיבור פעיל" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "שלח Ctrl+Alt+Del לחיבור הפעיל" - -#: ../src/vinagre-ui.h:93 +#: ../src/vinagre-ui.h:105 msgid "View the current machine in full screen" msgstr "הצג את המכונה הנוכחית במסך מלא" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "גודל _מקורי" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "התאם את החלון לגודל שולחן העבודה המרוחק" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "ה_תאמה" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "התאם את המסך המרוחק לגודל החלון הנוכחי" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_קריאה בלבד" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "כבה את פעילויות העכבר והמקלדת" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "סרגל _כלים" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "הצג או הסתר את סרגל הכלים" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "שורת _מצב" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "הצג או הסתר את שורת המצב" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_לוח צד" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "הצג או הסתר את סרגל הצד" - #: ../src/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "קרתה שגיאה:" @@ -761,25 +666,121 @@ msgid "Vinagre Website" msgstr "אתר האינטרנט של Vinagre" -#: ../src/vinagre-window.c:413 +#: ../src/vinagre-vnc-connection.c:198 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." + +#: ../src/vinagre-vnc-tab.c:131 +msgid "Desktop Name:" +msgstr "שם שולחן עבודה:" + +#: ../src/vinagre-vnc-tab.c:133 +msgid "Port:" +msgstr "שער:" + +#: ../src/vinagre-vnc-tab.c:134 +msgid "Dimensions:" +msgstr "מימדים:" + +#: ../src/vinagre-vnc-tab.c:253 +msgid "Error connecting to host." +msgstr "שגיאה בחיבור למארח" + +#: ../src/vinagre-vnc-tab.c:289 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "שיטת האימות אל המארח %s אינה נתמכת. (%u)." + +#: ../src/vinagre-vnc-tab.c:293 +msgid "Authentication unsupported" +msgstr "שיטת האימות לא נתמכת" + +#: ../src/vinagre-vnc-tab.c:560 +#: ../src/vinagre-vnc-tab.c:577 +msgid "Authentication error" +msgstr "שגיאת אימות" + +#: ../src/vinagre-vnc-tab.c:561 +msgid "A username is required in order to access this machine." +msgstr "נדרש שם משתמש לצורך גישה למכונה זאת." + +#: ../src/vinagre-vnc-tab.c:578 +msgid "A password is required in order to access this machine." +msgstr "נדרשת סיסמה לצורך גישה למכונה זאת." + +#: ../src/vinagre-vnc-tab.c:628 +msgid "S_caling" +msgstr "ה_תאמה" + +#: ../src/vinagre-vnc-tab.c:629 +#| msgid "Fit the remote screen into the current window size" +msgid "Fits the remote screen into the current window size" +msgstr "התאם את המסך המרוחק לגודל החלון הנוכחי" + +#: ../src/vinagre-vnc-tab.c:644 +#| msgid "Disable mouse and keyboard" +msgid "Does not send mouse and keyboard events" +msgstr "אינו שולח ארועי מקלדת ועכבר" + +#: ../src/vinagre-vnc-tab.c:657 +msgid "_Original size" +msgstr "גודל _מקורי" + +#: ../src/vinagre-vnc-tab.c:658 +msgid "Adjusts the window to the remote desktop's size" +msgstr "התאם את החלון לגודל שולחן העבודה המרוחק" + +#: ../src/vinagre-vnc-tab.c:681 +#: ../src/vinagre-vnc-tab.c:749 +#: ../src/vinagre-vnc-tab.c:750 +msgid "Send Ctrl-Alt-Del" +msgstr "שלח Ctrl-Alt-Del" + +#: ../src/vinagre-vnc-tab.c:682 +#| msgid "Send Ctrl+Alt+Del to active connection" +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "שליחת Ctrl+Alt+Del למחשב המרוחק" + +#: ../src/vinagre-vnc-tab.c:728 +#: ../src/vinagre-vnc-tab.c:729 +msgid "Scaling" +msgstr "התאמה" + +#: ../src/vinagre-vnc-tab.c:738 +#: ../src/vinagre-vnc-tab.c:739 +msgid "Read only" +msgstr "קריאה בלבד" + +#: ../src/vinagre-vnc-tab.c:907 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable this feature." +msgstr "" +"התאמה אינה נתמכת בהתקנה זאת.\n" +"\n" +"קרא את הקובץ README (המצורף ל־Vinagre) כדי לדעת איך להפעיל את תכונה זאת." + +#: ../src/vinagre-window.c:393 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "לא ניתן למזג את vinagre-ui.xml: ‏%s" -#: ../src/vinagre-window.c:441 +#: ../src/vinagre-window.c:421 msgid "_Recent connections" msgstr "חיבורים _אחרונים" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../src/vinagre-window.c:579 #, c-format msgid "Open %s:%d" msgstr "פתח %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "לחץ על Ctrl+Alt על מנת לשחרר את הסמן" - +#~ msgid "_Read only" +#~ msgstr "_קריאה בלבד" +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "לחץ על Ctrl+Alt על מנת לשחרר את הסמן" #~ msgid "Editing a bookmark" #~ msgstr "עורך סימנייה" #~ msgid "Enter a name for this connection" diff -Nru vinagre-2.26.1/po/hi.po vinagre-2.29.1/po/hi.po --- vinagre-2.26.1/po/hi.po 2009-03-06 13:07:36.000000000 +0000 +++ vinagre-2.29.1/po/hi.po 2009-09-17 15:20:20.000000000 +0100 @@ -1,15 +1,16 @@ -# translation of hi.po to Hindi +# translation of vinagre.master.po to Hindi # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Rajesh Ranjan , 2008, 2009. +# Rajesh Ranjan , 2009. msgid "" msgstr "" -"Project-Id-Version: hi\n" +"Project-Id-Version: vinagre.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-02-18 20:37+0000\n" -"PO-Revision-Date: 2009-03-06 16:43+0530\n" -"Last-Translator: Rajesh Ranjan \n" +"POT-Creation-Date: 2009-09-10 07:18+0000\n" +"PO-Revision-Date: 2009-09-14 09:33+0530\n" +"Last-Translator: Rajesh Ranjan \n" "Language-Team: Hindi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,13 +18,15 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n\n" "\n" "\n" +"\n" +"\n" "X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "परिचय (_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "मदद (_H)" @@ -32,157 +35,160 @@ msgstr "दूरस्थ डेस्कटॉप की पहुँच लें" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "दूरस्थ डेस्कटॉप प्रदर्शक" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "सत्यापन जरूरी है" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr " कनेक्शन विकल्प" - -#: ../data/vinagre.glade.h:3 -#| msgid "Connecting..." -msgid "Connection" -msgstr "कनेक्शन" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr " फ़ोल्डर" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "अंतरफलक" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "विकल्प" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr " जनक फ़ोल्डर" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "ऊपर सभी क्षेत्र अनिवार्य हैं" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "सत्यापन जरूरी है" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "पसंद" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1066 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "कनेक्शन" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "कनेक्शन विकल्प" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "फ़ोल्डर" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "होस्टः" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "अंतरफलक" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "विकल्प" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "जनक फ़ोल्डर" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "वरीयताएं" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "किस मशीन में आप कनेक्ट करना चाहते हैं?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "हमेशा टैब दिखाएँ (_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "सत्यापित किया (_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "पूर्ण स्क्रीन (_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "मेजबान (_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "नाम (_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "पासवर्ड: (_P)" -#: ../data/vinagre.glade.h:22 -#| msgid "_Remember this password" +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "प्रोटोकॉल (_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "यह श्रेय याद रखें (_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "अनुमापन (_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "मेन्यू शॉर्टकट दिखाएँ (_S)" -#: ../data/vinagre.glade.h:25 -#| msgid "_Name:" +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "उपयोक्ता नाम (_U):" -#: ../data/vinagre.glade.h:26 -#| msgid "_View" -msgid "_View only" -msgstr "केवल दृश्य (_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "प्लगिन सक्रिय" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "host or host:display or host::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"सक्रिय प्लगिन की सूची. यह सक्रिय प्लगिन का \"Location\" समाहित करता है. " +".vinagre-plugin फ़ाइल देखें दिए गए प्लगिन का \"Location\" पाने के लिए." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" -msgstr "" +msgstr "कनेक्ट संवाद में इतिहास मद की अधिकतम संख्या" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " "and will not be sent to the remote host." msgstr "" +"\"false\" पर सेट करें मेन्यू शॉर्टकट को निष्क्रिय करने के लिए. \"true\" पर उन्हें सक्रिय करने के लिए सेट करें. " +"नोट करें कि यदि वे सक्रिय हैं, वे कुंजियाँ मेन्यू के द्वारा बाधित होंगी और दूरस्थ मेजबान को नहीं भेजी जाएँगी." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." -msgstr "" +msgstr "\"true\" पर सेट करें टैब को हमेशा दिखाने के लिए. \"false\" पर सेट करें केवल तभी टैब दिखाने के लिए जब एक से अधिक सक्रिय कनेक्शन हो." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." -msgstr "" +msgstr "होस्ट लटकती प्रविष्टि में मद की अधिकतम संख्या निर्दिष्ट करें." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" -msgstr "" +msgstr "\"vnc://\" URL के लिए नियंत्रक" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " "to share the desktop with the other clients." -msgstr "" +msgstr "जब मेजबान से कनेक्ट किया जाता है, क्लाइंट सर्वर से कह सकता है दूसरे क्लाइंट को कनेक्टेड रहने या मौजूदा कनेक्शन छोड़ने के लिए. सही पर मान सेट करें डेस्कटॉप को दूसरे क्लाइंट के साथ साझा करने के लिए." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" -msgstr "" +msgstr "क्या हमें दूसरे क्लाइंट को कनेक्टेड छोड़ना चाहिए" + +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "क्या हमें टैब दिखाना चाहिए जब केवल एक सक्रिय कनेक्शन रहता है" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "क्या हमें मेन्यू त्वरक दिखाना चाहिए (shortcut keys)" #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" @@ -192,527 +198,742 @@ msgid "Remote Desktop Connection" msgstr "रिमोट डेस्कटॉप कनेक्शन" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 -msgid "A menu to quickly access remote machines" +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux टर्मिनल की पहुँच लें" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "पोर्टः" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH समर्थन" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "'shared' फ्लैग के लिए खराब मान: %d. यह 0 या 1 माना जाता है. इसे अनदेखा कर रहा है." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "अऩुमापित विधि सक्रिय करें" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC विकल्प:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC विकल्प दिखाएँ" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux विंडोज और दूसरे मशीन की पहुँच लें." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "फाइल विश्लेषित नहीं सका." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "फ़ाइल VNC नहीं है: \"connection\" समूह अनुपस्थित है." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "फ़ाइल VNC नहीं है: \"host\" कुंजी अनुपस्थित है." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC विकल्प" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "केवल दृश्य (_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "अनुमापन (_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC फ़ाइल" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "डेस्कटॉप नाम:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "आयाम:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "होस्ट से जुड़ने में त्रुटि" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "सत्यापन विधि %s को होस्ट करने के लिए समर्थित है. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "प्रमाणीकरण असमर्थित" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "प्रमाणीकरण त्रुटि" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "इस मशीन की पहुँच के लिए कोई उपयोक्तानाम जरूरी है." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "इस मशीन की पहुँच के लिए कोई कूटशब्द जरूरी है." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "अनुमापन (_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "मौजूदा विंडो आकार में दूरस्थ स्क्रीन को फिट करता है" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "माउस और कुंजीपट घटना का नहीं भेजता है" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "मूल आकार (_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "दूरस्थ डेस्कटॉप आकार में विंडो समायोजित करें" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "भेजें Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Ctrl+Alt+Del को सक्रिय कनेक्शन में भेजता है" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "आकार बदलें" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "सिर्फ पढ़ने के लिए" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." msgstr "" +"अनुमापन इस संस्थापन पर समर्थित नहीं है.\n" +"\n" +"README फ़ाइल पढ़ें (वीनाग्रे के साथ संलग्न) इस विशेषता को सक्रिय करने के बारे में जानने के लिए." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC समर्थन" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 +msgid "A menu to quickly access remote machines" +msgstr "दूरस्थ मशीन को तेजी से पहुंच के लिए एक मेन्यू" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "वाइग्रे एप्लेट फैक्टरी" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" -msgstr "" +msgstr "vinagre नहीं चला सका:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "रिमोट डेस्कटॉप प्रदर्शक खोलें" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "अपनी पुस्तचिह्न की पहुँच लें" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "प्रोटोकॉल %s समर्थित नहीं है." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" -msgstr "" +msgstr "पुस्तचिह्न आरंभ करने के दौरान त्रुटि: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:275 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "अज्ञात त्रुटि" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" -msgstr "" +msgstr "पुस्तचिह्न आरंभ करने के दौरान त्रुटि: फ़ाइल रिक्त प्रतीत होता है" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "" +msgstr "पुस्तचिह्न आरंभ करने के दौरान त्रुटि: फ़ाइल वीनाग्रे पुस्तचिह्न फ़ाइल नहीं है" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" -msgstr "" +msgstr "पुस्तचिह्न सहेजने के दौरान त्रुटि: XML संरचना बनाने में विफल" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" -msgstr "" +msgstr "पुस्तचिह्न सहेजने के दौरान त्रुटि: XML संरचना आरंभ करने में विफल" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" -msgstr "" +msgstr "पुस्तचिह्न सहेजने के दौरान त्रुटि: XML संरचना को अंतिम रूप रेखा देने में विफल" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" -msgstr "" +msgstr "पुस्तचिह्न सहेजने के दौरान त्रुटि: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" -msgstr "" +msgstr "पुस्तचिह्न उत्प्रवासन के दौरान त्रुटि: XML संरचना को बनाने में विफल" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" -msgstr "" +msgstr "पुस्तचिह्न उत्प्रवासन के दौरान त्रुटि: XML संरचना को आरंभीकृत करने में विफल" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" -msgstr "" +msgstr "पुस्तचिह्न उत्प्रवासन के दौरान त्रुटि: XML संरचना को अंतिम रूपरेखा देने में विफल" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" -msgstr "" +msgstr "पुस्तचिह्न उत्प्रवासन के दौरान त्रुटि: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "पुस्तचिह्न उत्प्रवासन के दौरान त्रुटि: वीएनसी प्लगिन सक्रिय नहीं है" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "निर्देशिका बनाने में विफल" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." msgstr "" +"नए प्रारूप में पुस्तचिह्न फ़ाइल को उत्प्रवासित कर रहा है. यह ऑपरेशन केवल एक बार चलने के लिए " +"माना गया है." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" -msgstr "" +msgstr "पुस्तचिह्न फ़ाइल खोलने में त्रुटि: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "उत्प्रवासन रद्द" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" -msgstr "" +msgstr "पुराने पुस्तचिह्न फ़ाइल को हटा नहीं सका" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "रूट फ़ोल्डर" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "इस फ़ोल्डर के लिए अवैध नाम" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "क्या आप निश्चित हैं कि आप %s को पुस्तचिह्न से हटाना चाहते हैं?" +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "इस फ़ोल्डर में नाम \"%s\" का उपयोग पहले से ही हो रहा है. कृपया भिन्न नाम उपयोग करें." -#: ../src/vinagre-bookmarks-ui.c:241 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "इस मद के लिए अवैध नाम" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(प्रोटोकॉल: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "क्या आप निश्चित हैं कि आप %s को पुस्तचिह्न से हटाना चाहते हैं?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "हटाएँ फ़ोल्डर?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." -msgstr "" +msgstr "देखें कि इसके सभी उपफोल्डर और मद साथ ही हटा दिए जाएँगे." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "हटाएँ वस्तु?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" -msgstr "" +msgstr "पुस्तचिह्न हटाने में त्रुटि: प्रविष्टि नहीं मिला" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "नया फ़ोल्डर" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "चुनें फाइल" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1156 -msgid "Supported formats" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "कोई समर्थित फ़ाइल नहीं है" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." msgstr "" +"कोई भी सक्रिय प्लगिन खोलने के लिए कोई समर्थित फ़ाइल नहीं देता है. कुछ प्लगिन सक्रिय करें " +"और फिर कोशिश करें." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "निम्नलिखित फ़ाइल नहीं खोली जा सकी:" +msgstr[1] "निम्नलिखित फ़ाइलें नहीं खोली जा सकी:" -#: ../src/vinagre-connect.c:179 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "प्रोटोकॉल सूची में कोई सक्रिय प्रोटोकॉल नहीं पा सका." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" -msgstr "" +msgstr "इतिहास फ़ाइल सहेजने के दौरान त्रुटि: %s" -#: ../src/vinagre-connect.c:191 -msgid "Choose a VNC Server" -msgstr "चुनें वीएनसी सर्वर" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "दूरस्थ डेस्कटॉप चुनें" -#: ../src/vinagre-connection.c:600 -#, c-format -msgid "The protocol %s is not supported." -msgstr "" - -#: ../src/vinagre-connection.c:695 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "फाइल खोल नहीं सका." -#: ../src/vinagre-connection.c:714 -msgid "Could not parse the file." -msgstr "फाइल विश्लेषित नहीं सका." - -#: ../src/vinagre-connection.c:759 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" - -#: ../src/vinagre-connection.c:765 -msgid "Could not find the host address in the file." -msgstr "" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "यह फ़ाइल किसी प्लगिन के दौरान नहीं पहचाना गया है." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "अवैध ऑपरेशन" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." -msgstr "" +msgstr "drag&drop संक्रिया से प्राप्त आँकड़ा अवैध है." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "होस्ट निकटस्थ" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr ".vnc फ़ाइल खोलें" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "वीनाग्रे को पूर्ण स्क्रीण विधि से खोलें" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 +msgid "Create a new toplevel window in an existing instance of vinagre" +msgstr "शीर्षस्तरीय विंडो को किसी मौजूदा वीनाग्रे उदाहरण में बनाएँ" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "किसी वीनाग्रे के द्वारा जाना कोई फ़ाइल खोलें" -#: ../src/vinagre-main.c:53 +#: ../vinagre/vinagre-main.c:70 msgid "filename" msgstr "फाइलनाम" -#: ../src/vinagre-main.c:56 -msgid "Create a new toplevel window in an existing instance of vinagre" -msgstr "" - -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "नीचे दी गयी त्रुटि आयी:" msgstr[1] "नीचे दी गयी त्रुटि आयी:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- GNOME के लिए वीएनसी क्लाएंट " +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- दूरस्थ डेस्कटॉप प्रदर्शक" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" -msgstr "" +msgstr "'vinagre --help' को कमांड लाइन विकल्प की पूरी सूची देखने के लिए चलाएँ" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" -msgstr "" +msgstr "अवही मेजबाननाम हल करने में विफल: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "प्लगिन %s सेवा %s के लिए किसी ब्राउज़र के साथ पहले से पंजीकृत है." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "mDNS ब्राउज़र को %s सेवा के लिए जोड़ने में विफल." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" -msgstr "" +msgstr "मेजबान के लिए ब्राउज करने में विफल: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 #, c-format -msgid "Connection to host %s was closed." -msgstr "" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS ब्राउजर आरंभ करने में विफल: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "मेजबान %s में कनेक्शन बंद हो गया." -#: ../src/vinagre-notebook.c:170 -#| msgid "Connecting..." +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "कनेक्शन बन्द" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "मेजबान %s में सत्यापन विफल रहा" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "सत्यापन असफल" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "जुड़ रहा है..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:882 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "कनेक्शन बंद करें" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "प्लगइन प्रबंधक" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "प्लगइन" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "सक्षम" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "कॉन्फ़िगर करें (_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "सक्रिय करें (_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "सभी सक्रिय करें (_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "सभी निष्क्रिय करें (_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "प्लगइन परिचय (_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "प्लगइन कॉन्फ़िगर करें (_o)" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "वरीयता प्रबंधक प्रारंभ नहीं कर सकता." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "होस्ट से जुड़ने में त्रुटि" - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "सत्यापन असफल" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "प्रमाणीकरण असमर्थित" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "पूर्ण स्क्रीन छोड़ें" -#: ../src/vinagre-tab.c:464 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." -msgstr "" - -#: ../src/vinagre-tab.c:496 -msgid "Error saving the credential on the keyring." -msgstr "" - -#: ../src/vinagre-tab.c:751 ../src/vinagre-tab.c:768 -msgid "Authentication error" -msgstr "प्रमाणीकरण त्रुटि" - -#: ../src/vinagre-tab.c:752 -msgid "A username is required in order to access this machine." -msgstr "" +msgstr "हाल के कनेक्शन सहेजने में त्रुटि." -#: ../src/vinagre-tab.c:769 -msgid "A password is required in order to access this machine." -msgstr "" - -#: ../src/vinagre-tab.c:895 -msgid "Minimize window" -msgstr "विंडो को न्यूनतम करें" +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "इस कीरिंग पर श्रेय सहेजने में त्रुटि." -#: ../src/vinagre-tab.c:910 ../src/vinagre-tab.c:911 -msgid "Scaling" -msgstr "आकार बदलें" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "कनेक्शन का स्क्रीनशॉट नहीं पा सका." -#: ../src/vinagre-tab.c:920 ../src/vinagre-tab.c:921 -msgid "Read only" -msgstr "सिर्फ पढ़ने के लिए" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "सहेजें स्क्रीनशॉट" -#. Machine menu -#: ../src/vinagre-tab.c:931 ../src/vinagre-tab.c:932 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "स्क्रीनशॉट लें" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s का स्क्रीनशॉट" -#: ../src/vinagre-tab.c:940 ../src/vinagre-tab.c:941 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "भेजें Ctrl-Alt-Del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "स्क्रीनशॉट सहेजने में त्रुटि" -#: ../src/vinagre-tab.c:1065 -msgid "Desktop Name:" -msgstr "डेस्कटॉप नाम:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "सेवा गुण पाना असंभव: %s" -#: ../src/vinagre-tab.c:1067 -msgid "Port:" -msgstr "पोर्टः" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "कनेक्शन बनाना असंभव: %s" -#: ../src/vinagre-tab.c:1068 -msgid "Dimensions:" -msgstr "आयाम:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "स्ट्रीम ट्यूब स्वीकारना असंभव: %s" -#: ../src/vinagre-tab.c:1134 -msgid "Could not get a screenshot of the connection." -msgstr "" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "संपर्क नाम पाना असंभव: %s" -#: ../src/vinagre-tab.c:1142 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s का स्क्रीनशॉट" +msgid "Impossible to get the avatar: %s" +msgstr "अवतार पाना असंभव: %s" -#: ../src/vinagre-tab.c:1145 -msgid "Save Screenshot" -msgstr "सहेजें स्क्रीनशॉट" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s आपके साथ अपने डेस्कटॉप को साझा करना चाहता है." -#: ../src/vinagre-tab.c:1209 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "डेस्कटॉप साझाकरण आमंत्रण" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "मशीन" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "संपादन (_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "देखें (_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "पसंद (_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "रिमोट मशीन से कनेक्ट करें" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr ".VNC फाइल खोलें" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "प्रोग्राम से बाहर जाएँ" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "अनुप्रयोग वरीयता संपादित करें" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "पुस्तचिह्न खोलें (_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "इस मशीन से जुड़ें" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "पुस्तचिह्न संपादित करें" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "चयनित पुस्तचिह्न संपादित करें" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "पुस्तचिह्न से हटाएँ" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" -msgstr "" +msgstr "पुस्तचिह्न से मौजूदा चयनित कनेक्शन हटाएँ" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "नया फ़ोल्डर (_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "नया फोल्डर बनाएं" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "विषय सूची (_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" -msgstr "" +msgstr "वीनाग्रे मैन्युल खोलें" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "इस अनुप्रयोग के बारे में" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "उपकरण-पट्टी (_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "उपकरण-पट्टी छुपाएँ या दिखाएँ" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "स्थिति-पट्टी (_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "स्थितिपट्टी दिखाएँ या छुपाएँ" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "किनारे का पटल" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "किनारे का पटल दिखाएँ या छुपाएँ" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "इस कनेक्शन को बंद करें" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "सभी बंद करें (_l)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "सभी सक्रिय कनेक्शन बंद करें" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "पुस्तचिह्न में जोड़ें" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" -msgstr "" +msgstr "अपने पुस्तचिह्न में मौजूदा कनेक्शन जोड़ें" -#: ../src/vinagre-ui.h:86 -msgid "Take a screenshot of active connection" -msgstr "" +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "स्क्रीनशॉट लें" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "भेजें Ctrl+Alt+Del सक्रिय कनेक्शन में" +#: ../vinagre/vinagre-ui.h:105 +msgid "Take a screenshot of active connection" +msgstr "सक्रिय कनेक्शन का स्क्रीनशॉट लें" -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" -msgstr "" +msgstr "पूर्ण स्क्रीन में मौजूदा मशीन देखें" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "मूल आकार (_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "दूरस्थ डेस्कटॉप आकार में विंडो समायोजित करें" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "अनुमापन (_c)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "सिर्फ पढ़ें (_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "माउस और कीबोर्ड निष्क्रिय करें" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "उपकरण-पट्टी (_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "उपकरण-पट्टी छुपाएँ या दिखाएँ" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "स्थिति-पट्टी (_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "स्थितिपट्टी दिखाएँ या छुपाएँ" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "किनारे का पटल" - -#: ../src/vinagre-ui.h:121 -#| msgid "Show or hide the toolbar" -msgid "Show or hide the side panel" -msgstr "किनारे का पटल दिखाएँ या छुपाएँ" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "एक त्रुटि आई:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "बिल्डर फ़ाइल नहीं लोड कर सका: %s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "वीनाग्रे गनोम डेस्कटॉप के लिए दूरस्थ डेस्कटॉप प्रदर्शक है" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -724,7 +945,7 @@ "Foundation; either version 2 of the License, or (at your option) any later " "version." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -736,7 +957,7 @@ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -744,32 +965,28 @@ "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "राजेश रंजन (rajeshkajha@yahoo.com)\n" "रविशंकर श्रीवास्तव (raviratlami@yahoo.com)" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre वेबसाइट" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" -msgstr "" +msgstr "vinagre-ui.xml मिला नहीं सका: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "हालिया कनेक्शन" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "खोलें %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "" - diff -Nru vinagre-2.26.1/po/hu.po vinagre-2.29.1/po/hu.po --- vinagre-2.26.1/po/hu.po 2009-03-26 18:20:03.000000000 +0000 +++ vinagre-2.29.1/po/hu.po 2009-09-17 15:20:20.000000000 +0100 @@ -2,28 +2,28 @@ # Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the Vinagre package. # -# Gabor Kelemen , 2007, 2008, 2009. -# Nyitrai István , 2008. -# Mate Ory , 2008. +# Gabor Kelemen , 2007, 2008, 2009. +# Nyitrai István , 2008. +# Mate Ory , 2008. msgid "" msgstr "" -"Project-Id-Version: vinagre.HEAD\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-20 20:31+0000\n" -"PO-Revision-Date: 2009-03-22 14:27+0100\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"Project-Id-Version: vinagre master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-10 14:16+0200\n" +"PO-Revision-Date: 2009-09-10 14:15+0200\n" +"Last-Translator: Gabor Kelemen \n" +"Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Névjegy" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Súgó" @@ -32,123 +32,120 @@ msgstr "Távoli asztalok elérése" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Távoli asztalok megjelenítése" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Hitelesítés szükséges" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Kapcsolódási beállítások" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Csatlakozás" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Mappa" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Felület" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Beállítások" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Szülőmappa" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Melyik géphez kíván kapcsolódni?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Minden fenti mező kötelező" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Minden fenti mező kötelező" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Hitelesítés szükséges" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Könyvjelzők" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Kapcsolat" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Kapcsolódási beállítások" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Mappa" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Gépnév:" -#: ../data/vinagre.glade.h:12 -msgid "Preferences" +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Felület" + +#: ../data/vinagre.ui.h:9 +msgid "Options" msgstr "Beállítások" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "Akkor is megjelenjenek-e a fülek, ha csak egy aktív kapcsolat van" +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Szülőmappa" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Megjelenjenek-e a menügyorsítók" +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "Beállítások" + +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Melyik géphez kíván kapcsolódni?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "A lapok _mindig láthatók" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Hitelesítés" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Teljes képernyő" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Gép:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Név:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Jelszó:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokoll:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Emlékezzen a hitelesítési adatokra" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Méretezés" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "M_enügyorsítók megjelenítése" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Felhasználónév:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Csak megtekintés" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Aktív bővítmények" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "gépnév vagy gépnév:kijelző vagy gépnév::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Az aktív bővítmények listája. Az aktív bővítmények helyét tartalmazza. Adott " +"bővítmény helyének beszerzéséhez lásd a .vinagre-plugin fájlt." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "A megjegyzett elemek maximális száma a kapcsolódási ablakban" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -158,7 +155,7 @@ "engedélyezésükhöz. Megjegyzés: ha engedélyezi őket, ezeket elkapja a menü, " "és nem kerülnek továbbításra a távoli gépre." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -166,15 +163,15 @@ "Állítsa igazra a fülek állandó mutatásához. Állítsa hamisra, ha csak akkor " "szeretné látni a füleket, ha több aktív kapcsolat van." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Megadja a gépnév mező javaslatainak maximumát." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Kezelő a „vnc://” URL címekhez" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -184,10 +181,19 @@ "kapcsolódó többi kliens kapcsolata meghagyandó vagy bontandó. Állítsa " "igazra, ha meg szeretné osztani az asztalt a többi klienssel." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Más kliensek maradjanak-e kapcsolódva" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Akkor is megjelenjenek-e a fülek, ha csak egy aktív kapcsolat van" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Megjelenjenek-e a menügyorsítók" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Távoli asztal (VNC) fájl" @@ -196,95 +202,281 @@ msgid "Remote Desktop Connection" msgstr "Távoli asztali kapcsolat" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux terminálok elérése" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH-támogatás" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"A „shared” jelző értéke hibás: %d. Az értéke 0 vagy 1 lehetne, figyelmen " +"kívül marad." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Méretezett mód engedélyezése" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC kapcsolói:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC kapcsolóinak megjelenítése" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows és más gépek elérése." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "A fájl nem dolgozható fel." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "A fájl nem VNC-fájl: hiányzik a „connection” csoport." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "A fájl nem VNC-fájl: hiányzik a „host” kulcs." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC kapcsolói" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Csak megtekintés" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Méretezés" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC-fájlok" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Asztal neve:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimenziók:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Hiba a géphez csatlakozás közben." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "A hitelesítési módszer a géphez (%s) nem támogatott. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "A hitelesítés nem támogatott" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Hitelesítési hiba" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "A számítógép eléréséhez felhasználónév szükséges." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "A számítógép eléréséhez jelszó szükséges." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "_Méretezés" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "A távoli képernyő nyújtása a jelenlegi ablak méretére" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Ne küldjön egér- és billentyűzeteseményeket" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Ere_deti méret" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Az ablak igazítása a távoli asztal méretéhez" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl+Alt+Del küldése" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Ctrl+Alt+Del küldése a távoli gépnek" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Méretezés" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Csak olvasható" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"A méretezés nincs támogatva a jelenlegi telepítésen.\n" +"\n" +"További információkért az engedélyezés módjáról olvassa el a Vinagre " +"alkalmazással szállított README fájlt." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC-támogatás" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Menü távoli gépekhez való gyors kapcsolódáshoz" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre kisalkalmazás factory" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "A vinagre nem futtatható:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "A távoliasztal-megjelenítő megnyitása" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Könyvjelzők elérése" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "A(z) %s protokoll nem támogatott." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Hiba a könyvjelzők előkészítésekor: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Ismeretlen hiba" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Hiba a könyvjelzők előkészítésekor: A fájl üresnek tűnik" -#: ../src/vinagre-bookmarks.c:358 -msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "Hiba a könyvjelzők előkészítésekor: A fájl nem egy vinagre könyvjelzőfájl" +#: ../vinagre/vinagre-bookmarks.c:357 +msgid "" +"Error while initializing bookmarks: The file is not a vinagre bookmarks file" +msgstr "" +"Hiba a könyvjelzők előkészítésekor: A fájl nem egy vinagre könyvjelzőfájl" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" -msgstr "Hiba a könyvjelzők mentése közben: Az XML-struktúra létrehozása meghiúsult" +msgstr "" +"Hiba a könyvjelzők mentése közben: Az XML-struktúra létrehozása meghiúsult" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" -msgstr "Hiba a könyvjelzők mentése közben: Az XML-struktúra előkészítése meghiúsult" +msgstr "" +"Hiba a könyvjelzők mentése közben: Az XML-struktúra előkészítése meghiúsult" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" -msgstr "Hiba a könyvjelzők mentése közben: Az XML-struktúra befejezése meghiúsult" +msgstr "" +"Hiba a könyvjelzők mentése közben: Az XML-struktúra befejezése meghiúsult" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Hiba a könyvjelzők mentése közben: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "Hiba a könyvjelzők átköltöztetése közben: Az XML-struktúra létrehozása " "meghiúsult" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Hiba a könyvjelzők átköltöztetése közben: Az XML-struktúra előkészítése " "meghiúsult" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Hiba a könyvjelzők átköltöztetése közben: Az XML-struktúra befejezése " "meghiúsult" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Hiba a könyvjelzők átköltöztetése közben: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" +"Hiba a könyvjelzők átköltöztetése közben: a VNC bővítmény nincs aktiválva" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "A könyvtár létrehozása meghiúsult" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -292,455 +484,481 @@ "A könyvjelzőfájl új formátumra alakítása. Ez a művelet csak egyszer fog " "lefutni." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Hiba a régi könyvjelzőfájl megnyitása közben: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Az átköltöztetés megszakítva" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "A régi könyvjelzőfájl nem távolítható el" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Gyökérmappa" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "A mappanév érvénytelen" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "The name \"%s\" is already used in this folder. Please use a different name." -msgstr "Ez a név („%s”) már használatban van a mappában. Használjon másik nevet." +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "" +"Ez a név („%s”) már használatban van a mappában. Használjon másik nevet." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Az elem neve érvénytelen" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokoll: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Biztosan törölni akarja a következőt a könyvjelzők közül: %s?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Biztosan törölni akarja a következőt a könyvjelzők közül: %s?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Eltávolítja a mappát?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Ne feledje, hogy az almappái és fájljai is eltávolításra kerülnek." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Eltávolítja az elemet?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Hiba a könyvjelző eltávolítása közben: A bejegyzés nem található" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Új mappa" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Válassza ki a fájlt" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Támogatott formátumok" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Nincsenek támogatott fájlok" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Az aktív bővítmények egyike sem képes a fájl megnyitására. Aktiváljon néhány " +"bővítményt és próbálja újra." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "A következő fájl nem nyitható meg:" msgstr[1] "A következő fájlok nem nyithatók meg:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Nem kérhető le az aktív protokoll a protokoll-listából." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Hiba a történet mentése közben: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Válasszon VNC kiszolgálót" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "A(z) %s protokoll nem támogatott." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Válasszon távoli asztalt" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "A fájl nem nyitható meg." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "A fájl nem dolgozható fel." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "A fájlt egyik bővítmény sem ismerte fel." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"A „shared” jelző értéke hibás: %d. Az értéke 0 vagy 1 lehetne, figyelmen " -"kívül marad." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Nem található gépcím a fájlban." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Érvénytelen művelet" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "A fogd és vidd műveletből fogadott adatok érvénytelenek." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Közeli gépek" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr ".vnc fájl megnyitása" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "A Vinagre megnyitása teljes képernyős módban" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "fájlnév" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Egy új főablak nyitása a vinagre létező előfordulásában" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "A Vinagre által ismert fájl megnyitása" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "fájlnév" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[kiszolgáló:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "A következő hiba keletkezett:" msgstr[1] "A következő hibák keletkeztek:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "– VNC kliens a GNOME-hoz" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "– Távoli asztalok megjelenítése" -#: ../src/vinagre-main.c:146 -msgid "Run 'vinagre --help' to see a full list of available command line options" +#: ../vinagre/vinagre-main.c:193 +msgid "" +"Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Futtassa a „vinagre --help” parancsot az elérhető parancssori lehetőségek " "teljes listájáért" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Avahi gépnév feloldása sikertelen: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "A(z) %s bővítmény már regisztrált böngészőt a(z) %s szolgáltatáshoz." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Az mDNS böngésző hozzáadása sikertelen a(z) %s szolgáltatáshoz." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Gépek böngészése sikertelen: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Az mDNS böngésző előkészítése sikertelen: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "A kapcsolat lezárva következő géphez: %s." +msgid "Connection to host %s was closed." +msgstr "A kapcsolat lezárva következő géphez: %s." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "A kapcsolat lezárva" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "A hitelesítés meghiúsult a következő géphez: %s" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "A hitelesítés meghiúsult" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Kapcsolódás…" -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Kapcsolat lezárása" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Bővítménykezelő" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Bővítmény" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Engedélyezve" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Beállítás" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Aktiválás" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Összes a_ktiválása" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "Összes l_etiltása" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "Bővítmény _névjegye" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "Bővítmény b_eállítása" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "A beállításkezelő nem indítható el." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Hiba a géphez csatlakozás közben." +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Teljes képernyő elhagyása" -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "A hitelesítés meghiúsult a következő géphez: %s" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "A hitelesítés meghiúsult" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "A hitelesítési módszer a géphez (%s) nem támogatott. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "A hitelesítés nem támogatott" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Hiba a legutóbbi kapcsolat mentésekor." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Hiba a hitelesítési adatok kulcstartóra mentésekor." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Hitelesítési hiba" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "A számítógép eléréséhez felhasználónév szükséges." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "A számítógép eléréséhez jelszó szükséges." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Ablak minimalizálása" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Méretezés" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Nem készíthető képernyőkép az aktív kapcsolatról." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Csak olvasható" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Képernyőkép mentése" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Képernyőkép készítése" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s képernyőképe" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl+Alt+Del küldése" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Hiba a képernyőkép mentésekor" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Asztal neve:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Nem lehet lekérni a szolgáltatás tulajdonságát: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "A kapcsolat létrehozása meghiúsult: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimenziók:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Nem fogadható el az adatfolyam-csatorna: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Nem készíthető képernyőkép az aktív kapcsolatról." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Nem kérhető le a partner neve: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s képernyőképe" +msgid "Impossible to get the avatar: %s" +msgstr "Nem kérhető le az avatar: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Képernyőkép mentése" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s meg szeretné Önnel osztani az asztalát." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"A méretezés nincs támogatva a jelenlegi telepítésen.\n" -"\n" -"További információkért az engedélyezés módjáról olvassa el a Vinagre " -"alkalmazással szállított README fájlt." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Felkérés asztal megosztására" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Gép" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "S_zerkesztés" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Nézet" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Könyvjelzők" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Kapcsolódás távoli géphez" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Egy .VNC fájl megnyitása" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Kilépés a programból" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Az alkalmazás beállításainak szerkesztése" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Könyvjelző megnyitása" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Kapcsolódás ehhez a géphez" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "Könyvjelző s_zerkesztése" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "A kijelölt könyvjelző részleteinek szerkesztése" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Eltávolítás a könyvjelzők közül" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "A jelenleg kiválasztott kapcsolat eltávolítása a könyvjelzők közül" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "Új _mappa" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Új mappa létrehozása" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Tartalom" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "A Vinagre kézikönyvének megnyitása" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Az alkalmazás névjegye" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Eszköztár" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Eszköztár megjelenítése vagy elrejtése" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Á_llapotsor" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Állapotsor megjelenítése vagy elrejtése" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Oldalsó _ablaktábla" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Az oldalsó ablaktábla megjelenítése vagy elrejtése" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "A jelenlegi kapcsolat bezárása" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "Összes be_zárása" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Az összes aktív kapcsolat bezárása" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "Hozzá_adás a könyvjelzőkhöz" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "A jelenlegi kapcsolat hozzáadása a könyvjelzőkhöz" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Képernyőkép készítése" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Képernyőkép készítése az aktív kapcsolatról" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Ctrl+Alt+Del küldése az aktív kapcsolatnak" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "A jelenlegi gép megjelenítése teljes képernyőn" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Ere_deti méret" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Az ablak igazítása a távoli asztal méretéhez" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "_Méretezés" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "A távoli képernyő nyújtása a jelenlegi ablak méretére" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Csak olvasható" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Egér és billentyűzet tiltása" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Eszköztár" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Eszköztár megjelenítése vagy elrejtése" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Á_llapotsor" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Állapotsor megjelenítése vagy elrejtése" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Oldalsó _ablaktábla" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Az oldalsó ablaktábla megjelenítése vagy elrejtése" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Hiba történt:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "A Vinagre egy VNC kliens a GNOME asztali környezethez" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "A felületfájl nem nyitható meg: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "A Vinagre egy távoliasztal-megjelenítő a GNOME asztali környezethez" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -751,7 +969,7 @@ "Foundation által kiadott GNU General Public License második (vagy bármely " "későbbi) változatában foglaltak alapján." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -763,7 +981,7 @@ "alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További " "részletekért tanulmányozza a GNU GPL licencet." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -771,33 +989,28 @@ "A programhoz a GNU General Public License egy példánya is jár, ha nem kapta " "meg, akkor keresse fel a oldalt." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Kelemen Gábor \n" "Nyitrai István \n" "Őry Máté " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "A Vinagre weboldala" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "A vinagre-ui.xml nem fésülhető össze: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Legutóbbi kapcsolatok" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s:%d megnyitása" - -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "A kurzor elengedéséhez nyomja meg a Ctrl+Alt kombinációt" - diff -Nru vinagre-2.26.1/po/it.po vinagre-2.29.1/po/it.po --- vinagre-2.26.1/po/it.po 2009-04-13 14:28:57.000000000 +0100 +++ vinagre-2.29.1/po/it.po 2009-09-17 15:20:20.000000000 +0100 @@ -1,14 +1,15 @@ # Italian translation of vinagre. # Copyright (C) 2007, 2008, 2009 THE vinagre'S COPYRIGHT HOLDER # This file is distributed under the same license as the vinagre package. +# Luca Ferretti , 2009. # Andrea Zagli , 2007, 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: vinagre 2.26.1\n" +"Project-Id-Version: vinagre 2.28.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=vinagre&component=general\n" -"POT-Creation-Date: 2009-04-07 05:31+0000\n" -"PO-Revision-Date: 2009-04-08 17:33+0200\n" +"POT-Creation-Date: 2009-09-14 10:52+0000\n" +"PO-Revision-Date: 2009-09-14 17:06+0200\n" "Last-Translator: Andrea Zagli \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -16,139 +17,136 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "I_nformazioni" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "A_iuto" #: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 msgid "Access remote desktops" -msgstr "Accesso a desktop remoti" +msgstr "Accede a desktop remoti" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Visualizzatore di desktop remoti" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "È richiesta l'autenticazione" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Opzioni della connessione" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Connessione" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Cartella" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interfaccia" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Opzioni" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Cartella superiore" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "A quale macchina ci si vuole connettere?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Tutti i campi sopra sono obbligatori" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Tutti i campi sopra sono obbligatori" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "È richiesta l'autenticazione" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Segnalibri" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Connessione" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Opzioni della connessione" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Cartella" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Host:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interfaccia" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Opzioni" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Cartella superiore" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Preferenze" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Indica se mostrare le linguette anche quando c'è solamente una connessione " -"attiva" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Indica se mostrare gli acceleratori dei menù (tasti scorciatoie)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "A quale macchina ci si vuole connettere?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "Mostr_are sempre le schede" +# essendo in forma verbale, che ne dite di +# Convalida ?? +# -Luca #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" -msgstr "Autenticazione fallita" +msgstr "_Autentica" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "Schermo _intero" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Host:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nome:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Password:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protocollo:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Ricordare queste credenziali" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Scala" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "Mo_strare le scorciatoie dei menù" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "Nome _utente:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Solo _visualizzazione" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Plugin attivi" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "host, host:display o host:porta" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Elenco di plugin attivi. Contiene la posizione dei plugin attivi. Vedere il " +"file «.vinagre-plugin» per ottenere la posizione di un dato plugin." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Numero massimo di voci della cronologia nel dialogo di connessione" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -158,7 +156,7 @@ "\"true\" per abilitarle. Notare che se sono abilitate, questi tasti saranno " "intercettati dal menù e non saranno inviati all'host remoto." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -166,16 +164,16 @@ "Impostare a \"true\" per mostrare sempre le linguette. Impostare a \"false\" " "per mostrare le linguette solamente se c'è più di una connessione attiva." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Specifica il numero massimo di voci nella casella a discesa per gli host." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" -msgstr "Il gestore per le URL \"vnc://\"" +msgstr "Il gestore per URL \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -186,10 +184,21 @@ "Impostare il valore a \"true\" per condividere il desktop con gli altri " "client." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Indica se lasciare gli altri client connessi" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Indica se mostrare le linguette anche quando c'è solamente una connessione " +"attiva" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Indica se mostrare gli acceleratori dei menù (tasti scorciatoie)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "File desktop remoto (VNC)" @@ -198,105 +207,285 @@ msgid "Remote Desktop Connection" msgstr "Connessione desktop remoto" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Accede a terminali Unix/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Porta:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Supporto a SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Valore non valido per il flag «shared»: %d. Dovrebbe essere o 0 o 1. Ignorato." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Abilita la modalità scalata" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Opzioni di VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Mostra le opzioni di VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Accede a macchine Unix/Linux, Windows e altro." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Impossibile analizzare il file." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Il file non è un file VNC: manca il gruppo «connection»." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Il file non è un file VNC: manca la chiave «host»." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Opzioni VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Solo _visualizzazione" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Scala" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "File VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nome desktop:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensioni:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Errore durante la connessione all'host." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Il metodo di autenticazione all'host «%s» non è supportato. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Autenticazione non supportata" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Autenticazione fallita" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "È richiesto un nome utente per poter accedere a questo computer." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "È richiesta una password per poter accedere a questo computer." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "S_cala" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Adatta lo schermo remoto alla dimensione della finestra corrente" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Non invia gli eventi di mouse e tastiera" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Grandezza _originale" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Aggiusta la finestra alla grandezza del desktop remoto" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Invia Ctrl+Alt+Canc" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Invia Ctrl+Alt+Canc alla macchina remota" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Scala" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Sola lettura" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"La scala non è supportata in questa installazione.\n" +"\n" +"Leggere il file README (fornito con Vinagre) per sapere come abilitare " +"questa caratteristica." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Supporto a VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Un menù per accedere velocemente a macchine remote" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Fabbrica Applet Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Impossibile eseguire vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Apri Visualizzatore di desktop remoti" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Accedi ai segnalibri" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Il protocollo %s non è supportato." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Errore durante l'inizializzazione dei segnalibri: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Errore sconosciuto" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "" "Errore durante l'inizializzazione dei segnalibri: il file sembra essere vuoto" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Errore durante l'inizializzazione dei segnalibri: il file non è un file di " "segnalibri di vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "" "Errore durante il salvataggio dei segnalibri: fallita la creazione della " "struttura XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "Errore durante il salvataggio dei segnalibri: fallita l'inizializzazione " "della struttura XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Errore durante il salvataggio dei segnalibri: fallita la finalizzazione " "della struttura XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Errore durante il salvataggio dei segnalibri: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "Errore durante la migrazione dei segnalibri: fallita la creazione della " "struttura XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Errore durante la migrazione dei segnalibri: fallita l'inizializzazione " "della struttura XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Errore durante la migrazione dei segnalibri: fallita la finalizzazione della " "struttura XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Errore durante la migrazione dei segnalibri: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" +"Errore durante la migrazione dei segnalibri: il plugin di VLC non è attivato" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Fallita la creazione della directory" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -304,462 +493,484 @@ "Migrazione dei segnalibri al nuovo formato. Questa operazione si suppone " "venga eseguita una volta sola." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Errore durante l'apertura del vecchio file dei segnalibri: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migrazione annullata" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Impossibile rimuovere il vecchio file dei segnalibri" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Cartella radice" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Nome non valido per questa cartella" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." msgstr "" "Il nome «%s» è già utilizzato in questa cartella. Utilizzare un nome diverso." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Nome non valido per questo oggetto" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protocollo: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Rimuovere %s dai segnalibri?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Rimuovere «%s» dai segnalibri?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Rimuovere la cartella?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "" "Notare che anche tutte le sue sotto cartelle e oggetti saranno rimossi." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Rimuovere l'oggetto?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Errore durante la rimozione del segnalibro: voce non trovata" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Nuova cartella" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Scegli il file" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Formati supportati" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Non ci sono file supportati" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Nessuno dei plugin attivi offre un supporto al file che deve essere aperto. " +"Attivare qualche plugin e riprovare." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Il file seguente non può essere aperto:" msgstr[1] "I file seguenti non possono essere aperti:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Impossibile ottenere il protocollo attivo nell'elenco dei protocolli." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Errore durante il salvataggio del file della cronologia: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Scegli un server VNC" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Il protocollo %s non è supportato." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Scegliere un desktop remoto" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Impossibile aprire il file." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Impossibile analizzare il file." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Il file non è stato riconosciuto da alcun plugin." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Valore non valido per il flag «shared»: %d. Si suppone che sia o 0 o 1. " -"Ignorato." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Impossibile trovare l'indirizzo dell'host nel file." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Operazione non valida" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "I dati ricevuti dall'operazione di «drag & drop» non sono validi." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Host vicini" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Apre un file .vnc" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Apre vinagre in modalità schermo intero" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "NOMEFILE" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "" "Crea una nuova finestra di livello principale in un'istanza esistente di " "vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Apre un file riconosciuto da vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "NOMEFILE" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[SERVER:PORTA]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Si è verificato il seguente errore:" msgstr[1] "Si sono verificati i seguenti errori:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- Client VNC per GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Visualizzatore di desktop remoti" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Eseguire «vinagre --help» per vedere un elenco completo delle opzioni della " "riga di comando disponibili" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Fallita la risoluzione del nome host avahi: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Il plugin «%s» ha già registrato un esploratore per il servizio «%s»." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Fallita l'aggiunta dell'esploratore mDNS per il servizio «%s»." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Fallita l'esplorazione degli host: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 #, c-format -msgid "Connection to host %s was closed." -msgstr "La connessione all'host «%s» è stata chiusa." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Fallita l'inizializzazione dell'esploratore mDNS: %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "La connessione all'host «%s» è stata chiusa." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Connessione chiusa" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "L'autenticazione all'host «%s» è fallita" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Autenticazione fallita" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Connessione..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Chiudi connessione" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Gestore plugin" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Plugin" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Abilitato" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "C_onfigura" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Attiva" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Attiva _tutti" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Disattiva tutti" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "I_nformazioni plugin" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "C_onfigura plugin" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Impossibile inizializzare il gestore preferenze." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Errore durante la connessione all'host." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "L'autenticazione all'host «%s» è fallita" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Finestra normale" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Autenticazione fallita" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Il metodo di autenticazione all'host «%s» non è supportato. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Autenticazione non supportata" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Errore durante il salvataggio della connessione recente." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Errore durante il salvataggio delle credenziali nel portachiavi." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Autenticazione fallita" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "È richiesto un nome utente per poter accedere a questo computer." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "È richiesta una password per poter accedere a questo computer." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimizza la finestra" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Impossibile ottenere una schermata della connessione." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Scala" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Salva schermata" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Sola lettura" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Schermata di %s" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Cattura schermata" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Errore durante il salvataggio della schermata" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Invia Ctrl+Alt+Canc" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Impossibile ottenere la proprietà del servizio: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Nome desktop:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Impossibile creare la connessione: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Porta:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Impossibile accettare il flusso del tubo: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensioni:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Impossibile ottenere il nome del contatto: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Impossibile ottenere una schermata della connessione." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Impossibile ottenere l'avatar: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "Schermata di %s" +msgid "%s wants to share his desktop with you." +msgstr "«%s» vuole condividere il suo desktop." -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Salva schermata" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"La scala non è supportata in questa installazione.\n" -"\n" -"Leggere il file README (fornito con Vinagre) per conoscere come abilitare " -"questa caratteristica." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Invito per la condivisione del desktop" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Macchina" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Modifica" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Visualizza" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "Segnali_bri" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Connette a una macchina remota" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Apre un file .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Esce dal programma" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Modifica le preferenze dell'applicazione" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Apri segnalibro" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Connette a questa macchina" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Modifica segnalibro" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Modifica i dettagli del segnalibro selezionato" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Rimuovi dai segnalibri" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Rimuove dai segnalibri la connessione attualmente selezionata" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Nuova cartella" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Crea una nuova cartella" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Sommario" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Apre la guida di vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Informazioni su questa applicazione" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Barra degli _strumenti" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Mostra o nasconde la barra degli strumenti" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Barra di s_tato" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Mostra o nasconde la barra di stato" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Riquadro laterale" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Mostra o nasconde il riquadro laterale" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Chiude la connessione corrente" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "C_hiude tutte" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Chiude tutte le connessioni attive" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Aggiungi ai segnalibri" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Aggiunge la connessione corrente ai propri segnalibri" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Cattura schermata" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Cattura una schermata della connessione attiva" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Invia Ctrl+Alt+Canc alla connessione attiva" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Visualizza la macchina corrente a schermo intero" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Grandezza _originale" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Aggiusta la finestra alla grandezza del desktop remoto" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "S_cala" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Adatta lo schermo remoto alla dimensione corrente della finestra" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "Sola lettu_ra" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Disabilita mouse e tastiera" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Barra degli _strumenti" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Mostra o nasconde la barra degli strumenti" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Barra di s_tato" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Mostra o nasconde la barra di stato" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_Riquadro laterale" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Mostra o nasconde il riquadro laterale" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Si è verificato un errore:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre è un client VNC per lo GNOME Desktop" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Impossibile caricare il file generatore: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre è un visualizzatore di desktop remoti per lo GNOME Desktop" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -771,7 +982,7 @@ "Free Software Foundation; versione 2 della licenza, o (a scelta) una " "versione più recente." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -783,7 +994,7 @@ "APPLICABILITÀ PER UNO SCOPO PARTICOLARE. Per maggiori dettagli consultare la " "GNU General Public License." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -791,32 +1002,61 @@ "Si dovrebbe aver ricevuto una copia della GNU General Public License con " "questo programma. In caso contrario vedere ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "Andrea Zagli " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Sito web di Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Impossibile unire vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "Connessioni _recenti" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Apri %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Premere Ctrl+Alt per rilasciare il puntatore" +#~ msgid "Connection" +#~ msgstr "Connessione" + +#~ msgid "Folder" +#~ msgstr "Cartella" + +#~ msgid "host or host:display or host::port" +#~ msgstr "host, host:display o host:porta" + +#~ msgid "Supported formats" +#~ msgstr "Formati supportati" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Scegli un server VNC" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "Impossibile trovare l'indirizzo dell'host nel file." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Apre un file .vnc" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- Client VNC per GNOME" + +#~ msgid "Minimize window" +#~ msgstr "Minimizza la finestra" + +#~ msgid "_Read only" +#~ msgstr "Sola lettu_ra" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Premere Ctrl+Alt per rilasciare il puntatore" #~ msgid "Editing a bookmark" #~ msgstr "Modifica di un segnalibro" diff -Nru vinagre-2.26.1/po/kn.po vinagre-2.29.1/po/kn.po --- vinagre-2.26.1/po/kn.po 2009-03-20 20:32:25.000000000 +0000 +++ vinagre-2.29.1/po/kn.po 2009-09-17 15:20:20.000000000 +0100 @@ -1,14 +1,14 @@ -# translation of vinagre.HEAD.kn.po to Kannada +# translation of vinagre.master.kn.po to Kannada # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Shankar Prasad , 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: vinagre.HEAD.kn\n" +"Project-Id-Version: vinagre.master.kn\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-02-18 20:37+0000\n" -"PO-Revision-Date: 2009-03-20 17:23+0530\n" +"POT-Creation-Date: 2009-09-01 06:12+0000\n" +"PO-Revision-Date: 2009-09-17 12:03+0530\n" "Last-Translator: Shankar Prasad \n" "Language-Team: Kannada \n" "MIME-Version: 1.0\n" @@ -17,11 +17,11 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "ಬಗ್ಗೆ(_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "ನೆರವು(_H)" @@ -30,160 +30,167 @@ msgstr "ದೂರಸ್ಥ ಗಣಕತೆರೆಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಿ" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "ದೂರಸ್ಥ ಗಣಕತೆರೆಗಳ ವೀಕ್ಷಕ" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "ಸಂಪರ್ಕದ ಆಯ್ಕೆಗಳು" - -#: ../data/vinagre.glade.h:3 -#| msgid "Connection options" -msgid "Connection" -msgstr "ಸಂಪರ್ಕ" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "ಕಡತಕೋಶ" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "ಸಂಪರ್ಕಸಾಧನ" - -#: ../data/vinagre.glade.h:6 -#| msgid "Connection options" -msgid "Options" -msgstr "ಆಯ್ಕೆಗಳು" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "ಮೂಲ ಕಡತಕೋಶ" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "ಯಾವ ಗಣಕಕ್ಕೆ ನೀವು ಸಂಪರ್ಕಿತಗೊಳ್ಳಲು ಬಯಸುತ್ತೀರಿ?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "ಮೇಲಿನ ಎಲ್ಲಾ ಕ್ಷೇತ್ರಗಳು ಖಡ್ಡಾಯವಾಗಿವೆ" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "ಮೇಲಿನ ಎಲ್ಲಾ ಕ್ಷೇತ್ರಗಳು ಖಡ್ಡಾಯವಾಗಿವೆ" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳು" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1066 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "ಸಂಪರ್ಕದ ಆಯ್ಕೆಗಳು" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "ಕಡತಕೋಶ" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "ಅತಿಥೇಯ:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "ಸಂಪರ್ಕಸಾಧನ" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "ಆಯ್ಕೆಗಳು" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "ಮೂಲ ಕಡತಕೋಶ" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "ಆದ್ಯತೆಗಳು" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "ಕೇವಲ ಒಂದು ಸಕ್ರಿಯ ಸಂಪರ್ಕವಿದ್ದಾಗಲೂ ಸಹ ನಾವು ಹಾಳೆಗಳನ್ನು ತೋರಿಸಬೇಕೆ" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "ಯಾವ ಗಣಕಕ್ಕೆ ನೀವು ಸಂಪರ್ಕಿತಗೊಳ್ಳಲು ಬಯಸುತ್ತೀರಿ?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "ನಾವು ಮೆನು ವೇಗವರ್ಧಕಗಳನ್ನು ತೋರಿಸಬೇಕೆ (ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು)" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "ಯಾವಾಗಲೂ ಹಾಳೆಗಳನ್ನು ತೋರಿಸು(_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "ದೃಢೀಕರಿಸು(_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "ಪೂರ್ಣತೆರೆ(_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "ಅತಿಥೇಯ(_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "ಹೆಸರು(_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "ಗುಪ್ತಪದ(_P):" -#: ../data/vinagre.glade.h:22 -#| msgid "_Remember this password" +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "ಪ್ರೊಟೊಕಾಲ್(_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "ಈ ಪರಿಚಯನ್ನು ನೆನನಪಿಟ್ಟುಕೊ (_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "ಅಳತೆ ಬದಲಾವಣೆ(_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "ಮೆನು ಶಾರ್ಟ್-ಕಟ್‌ಗಳನ್ನು ತೋರಿಸು(_S)" -#: ../data/vinagre.glade.h:25 -#| msgid "_Name:" +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "ಬಳಕೆದಾರ ಹೆಸರು(_U):" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "ನೋಟ ಮಾತ್ರ(_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "ಸಕ್ರಿಯ ಪ್ಲಗ್ಗಿನ್ನುಗಳು" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "host ಅಥವ host:display ಅಥವ host::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"ಸಕ್ರಿಯ ಪ್ಲಗ್‌ಇನ್‌ಗಳ ಪಟ್ಟಿ. ಇದು ಸಕ್ರಿಯ ಪ್ಲಗ್‌ಇನ್‌ಗಳು ಇರುವ \"ಸ್ಥಳ\"ವನ್ನು ಹೊಂದಿರುತ್ತದೆ. " +"ಒದಗಿಸಲಾದ ಒಂದು ಪ್ಲಗ್‌ಇನ್‌ ಇರುವ \"ಸ್ಥಳ\"ವನ್ನು ಕಂಡುಕೊಳ್ಳಲು .vinagre-plugin ಕಡತವನ್ನು ನೋಡಿ." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "ಸಂಪರ್ಕ ಸಂವಾದದಲ್ಲಿನ ಗರಿಷ್ಟ ಸಂಖ್ಯೆಯ ಇತಿಹಾಸದ ಅಂಶಗಳು" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " "and will not be sent to the remote host." msgstr "" -"ಶಾರ್ಟ್-ಕಟ್‌ಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು \"false\" ಗೆ ಬದಲಾಯಿಸಿ. ಅವನ್ನು ಶಕ್ತಗೊಳಿಸಲು \"true\" ಗೆ ಬದಲಾಯಿಸಿ. " -"ಅವುಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿದಲ್ಲಿ, ಆ ಕೀಲಿಗಳನ್ನು ಮೆನುವಿನಿಂದ ಅರ್ಥೈಸಿಕೊಳ್ಳಲಾಗುತ್ತದೆ ಹಾಗು ಅವನ್ನು ದೂರಸ್ಥ ಅತಿಥೇಯಕ್ಕೆ ಕಳುಹಿಸಲಾಗುವುದಿಲ್ಲ." +"ಶಾರ್ಟ್-ಕಟ್‌ಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು \"false\" ಗೆ ಬದಲಾಯಿಸಿ. ಅವನ್ನು ಶಕ್ತಗೊಳಿಸಲು \"true\" ಗೆ " +"ಬದಲಾಯಿಸಿ. ಅವುಗಳನ್ನು ಶಕ್ತಗೊಳಿಸಿದಲ್ಲಿ, ಆ ಕೀಲಿಗಳನ್ನು ಮೆನುವಿನಿಂದ ಅರ್ಥೈಸಿಕೊಳ್ಳಲಾಗುತ್ತದೆ " +"ಹಾಗು ಅವನ್ನು ದೂರಸ್ಥ ಅತಿಥೇಯಕ್ಕೆ ಕಳುಹಿಸಲಾಗುವುದಿಲ್ಲ." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." -msgstr "ಹಾಳೆಗಳನ್ನು ಯಾವಾಗಲೂ ತೋರಿಸಲು \"true\" ಗೆ ಬದಲಾಯಿಸಿ. ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಸಕ್ರಿಯ ಸಂಪರ್ಕವು ಇದ್ದಲ್ಲಿ ಹಾಳೆಗಳನ್ನು ತೋರಿಸಲು \"false\" ಗೆ ಬದಲಾಯಿಸಿ." +msgstr "" +"ಹಾಳೆಗಳನ್ನು ಯಾವಾಗಲೂ ತೋರಿಸಲು \"true\" ಗೆ ಬದಲಾಯಿಸಿ. ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಸಕ್ರಿಯ " +"ಸಂಪರ್ಕವು ಇದ್ದಲ್ಲಿ ಹಾಳೆಗಳನ್ನು ತೋರಿಸಲು \"false\" ಗೆ ಬದಲಾಯಿಸಿ." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "ಅತಿಥೇಯದ ಬೀಳಿಕೆ ನಮೂದಿನಲ್ಲಿನ ಗರಿಷ್ಟ ಸಂಖ್ಯೆಯ ಅಂಶಗಳನ್ನು ಸೂಚಿಸುತ್ತದೆ." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" URL ಗಳ ಹ್ಯಾಂಡ್ಲರ್" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " "to share the desktop with the other clients." -msgstr "ಅತಿಥೇಯದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳುವಾಗ, ಇತರೆ ಕ್ಲೈಂಟ್‌ಗಳೊಂದಿಗಿನ ಸಂಪರ್ಕವು ಹಾಗೆಯೆ ಇರಲು ಬಿಡು ಅಥವ ಈಗಿರುವ ಸಂಪರ್ಕಗಳನ್ನು ಬಿಟ್ಟುಬಿಡು ಎಂದು ಪರಿಚಾರಕಕ್ಕೆ ಕ್ಲೈಂಟ್‌ ಹೇಳಬಹುದು. ಗಣಕತೆರೆಯನ್ನು ಇತರೆ ಕ್ಲೈಂಟಿನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲು ಮೌಲ್ಯವನ್ನು true ಗೆ ಹೊಂದಿಸು." +msgstr "" +"ಅತಿಥೇಯದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಳ್ಳುವಾಗ, ಇತರೆ ಕ್ಲೈಂಟ್‌ಗಳೊಂದಿಗಿನ ಸಂಪರ್ಕವು ಹಾಗೆಯೆ ಇರಲು ಬಿಡು " +"ಅಥವ ಈಗಿರುವ ಸಂಪರ್ಕಗಳನ್ನು ಬಿಟ್ಟುಬಿಡು ಎಂದು ಪರಿಚಾರಕಕ್ಕೆ ಕ್ಲೈಂಟ್‌ ಹೇಳಬಹುದು. ಗಣಕತೆರೆಯನ್ನು " +"ಇತರೆ ಕ್ಲೈಂಟಿನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲು ಮೌಲ್ಯವನ್ನು true ಗೆ ಹೊಂದಿಸು." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "ಬೇರೆ ಕ್ಲೈಂಟ್‌ಗಳು ಸಂಪರ್ಕಿತಗೊಂಡಿರಲು ನಾವು ಬಿಡಬೇಕೆ" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "ಕೇವಲ ಒಂದು ಸಕ್ರಿಯ ಸಂಪರ್ಕವಿದ್ದಾಗಲೂ ಸಹ ನಾವು ಹಾಳೆಗಳನ್ನು ತೋರಿಸಬೇಕೆ" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "ನಾವು ಮೆನು ವೇಗವರ್ಧಕಗಳನ್ನು ತೋರಿಸಬೇಕೆ (ಶಾರ್ಟ್-ಕಟ್‌ ಕೀಲಿಗಳು)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "ದೂರಸ್ಥ ಗಣಕತೆರೆ (VNC) ಕಡತ" @@ -192,546 +199,751 @@ msgid "Remote Desktop Connection" msgstr "ದೂರಸ್ಥ ಗಣಕತೆರೆ ಸಂಪರ್ಕ" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux ಟರ್ಮಿನಲ್‌ಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಿ" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "ಸಂಪರ್ಕಸ್ಥಾನ:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH ಬೆಂಬಲ" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"'ಹಂಚಲಾದ' ಫ್ಲಾಗಿಗೆ ಸರಿಯಲ್ಲದ ಮೌಲ್ಯ: %d. ಅದು 0 ಅಥವ 1 ಆಗಿರಬೇಕು. ಅದನ್ನು " +"ನಿರ್ಲಕ್ಷಿಸಲಾಗುತ್ತಿದೆ." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "ಸ್ಕೇಲ್ಡ್ ಕ್ರಮವನ್ನು ಶಕ್ತಗೊಳಿಸು" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC ಆಯ್ಕೆಗಳು:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC ಆಯ್ಕೆಗಳನ್ನು ತೋರಿಸು" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows ಹಾಗು ಇನ್ನಿತರೆ ಗಣಕಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಿ." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "ಕಡತವನ್ನು ಪಾರ್ಸ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "ಕಡತವು ಒಂದು VNC ಕಡತವಾಗಿಲ್ಲ: \"connection\"(ಸಂಪರ್ಕ) ಗುಂಪು ಕಾಣೆಯಾಗಿದೆ." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "ಕಡತವು ಒಂದು VNC ಕಡತವಾಗಿಲ್ಲ: \"host\"(ಆತಿಥೇಯ) ಕೀಲಿಯು ಕಾಣೆಯಾಗಿದೆ." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC ಆಯ್ಕೆಗಳು" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "ನೋಟ ಮಾತ್ರ(_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "ಅಳತೆ ಬದಲಾವಣೆ(_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC ಕಡತಗಳು" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "ಗಣಕತೆರೆ ಹೆಸರು:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "ಆಯಾಮಗಳು:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "ಅತಿಥೇಯಕ್ಕೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಲ್ಲಿ ದೋಷ." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "ಅತಿಥೇಯ %s ಕ್ಕಾಗಿನ ದೃಢೀಕರಣ ವಿಧಾನಕ್ಕೆ ಬೆಂಬಲವಿಲ್ಲ. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "ದೃಢೀಕರಣವು ಬೆಂಬಲಿತವಾಗಿಲ್ಲ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "ದೃಢೀಕರಣದ ದೋಷ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "ಈ ಗಣಕವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಬಳಕೆದಾರರ ಹೆಸರಿನ ಅಗತ್ಯವಿದೆ." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "ಈ ಗಣಕವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಬಳಕೆದಾರರ ಒಂದು ಗುಪ್ತಪದದ ಅಗತ್ಯವಿದೆ." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "ಗಾತ್ರದ ಹೊಂದಿಕೆ(_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "ದೂರಸ್ಥ ತೆರೆಯನ್ನು ಪ್ರಸಕ್ತ ವಿಂಡೋ ಗಾತ್ರಕ್ಕೆ ಸರಿಹೊಂದಿಸುತ್ತದೆ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +#| msgid "Disable mouse and keyboard" +msgid "Does not send mouse and keyboard events" +msgstr "ಮೌಸ್ ಹಾಗು ಕೀಲಿಮಣೆ ಘಟನೆಯನ್ನು ಕಳುಹಿಸಲಬೇಡಸ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "ಮೂಲ ಗಾತ್ರ(_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "ವಿಂಡೋವನ್ನು ದೂರಸ್ಥ ಗಣಕತೆರೆಯ ಗಾತ್ರಕ್ಕೆ ಹೊಂದಿಸುತ್ತದೆ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del ಅನ್ನು ಕಳುಹಿಸಿ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +#| msgid "Send Ctrl+Alt+Del to active connection" +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕಕ್ಕಾಗಿ Ctrl+Alt+Del ಅನ್ನು ಕಳುಹಿಸು" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "ಅಳತೆ ಬದಲಾವಣೆ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "ಓದಲು ಮಾತ್ರ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"ಈ ಅನುಸ್ತಾಪನೆಯಲ್ಲಿ ಗಾತ್ರ ಬದಲಾವಣೆಗೆ(ಸ್ಕೇಲಿಂಗ್‌) ಬೆಂಬಲವಿಲ್ಲ.\n" +"\n" +"ಈ ಸವಲತ್ತನ್ನು ಹೇಗೆ ಶಕ್ತಗೊಳಿಸುವುದು ಎಂಬುದನ್ನು ಅರಿಯಲು README ಕಡತವನ್ನು (Vinagre " +"ನೊಂದಿಗೆ ನೀಡಲಾದ) ಓದಿ." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC ಬೆಂಬಲ" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "ದೂರಸ್ಥ ಗಣಕಗಳನ್ನು ತಕ್ಷಣ ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಬಳಸಲಾಗುವ ಒಂದು ಮೆನು" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre ಆಪ್ಲೆಟ್ ಫ್ಯಾಕ್ಟರಿ" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 -#| msgid "Could not run vinagre: %s" +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "vinagre ಅನ್ನು ಚಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "ದೂರಸ್ಥ ಗಣಕತೆರೆ ವೀಕ್ಷಕವನ್ನು ತೆರೆ" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "ನಿಮ್ಮ ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಿ" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "ಪ್ರೋಟೋಕಾಲ್ %s ಬೆಂಬಲಿತವಾಗಿಲ್ಲ." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:275 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ" -#: ../src/vinagre-bookmarks.c:351 -#| msgid "Error while initializing bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ: ಕಡತವು ಖಾಲಿ ಇರುವಂತೆ ತೋರುತ್ತಿದೆ" -#: ../src/vinagre-bookmarks.c:358 -#| msgid "Error while initializing bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ: ಕಡತವು ಒಂದು ಮಾನ್ಯವಾದ vinagre ಬುಕ್‌ಮಾರ್ಕ್ ಕಡತವಾಗಿಲ್ಲ" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ: XML ರಚನೆಯನ್ನು ನಿರ್ಮಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ: XML ರಚನೆಯನ್ನು ಆರಂಭಿಸಲು ವಿಫಲಗೊಂಡಿದೆ" -#: ../src/vinagre-bookmarks.c:450 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ: XML ರಚನೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸಲು ವಿಫಲಗೊಂಡಿದೆ" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ವರ್ಗಾಯಿಸುವಲ್ಲಿ ದೋಷ: XML ರಚನೆಯನ್ನು ನಿರ್ಮಿಸಲು ವಿಫಲಗೊಂಡಿದೆ" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ವರ್ಗಾಯಿಸುವಲ್ಲಿ ದೋಷ: XML ರಚನೆಯನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ವರ್ಗಾಯಿಸುವಲ್ಲಿ ದೋಷ: XML ರಚನೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format -#| msgid "Error while saving bookmarks: %s" msgid "Error while migrating bookmarks: %s" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ವರ್ಗಾಯಿಸುವಲ್ಲಿ ದೋಷ: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ವರ್ಗಾಯಿಸುವಲ್ಲಿ ದೋಷ: VNC ಪ್ಲಗ್‌ಇನ್ ಸಕ್ರಿಯಗೊಂಡಿಲ್ಲ" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "ಕೋಶವನ್ನು ನಿರ್ಮಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." -msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳ ಕಡತವನ್ನು ಹೊಸ ರಚನೆಗೆ ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ. ಈ ಕಾರ್ಯವು ಕೇವಲ ಒಮ್ಮೆ ಮಾತ್ರ ಚಲಾಯಿತಗೊಳ್ಳಬೇಕು." +msgstr "" +"ಬುಕ್‌ಮಾರ್ಕುಗಳ ಕಡತವನ್ನು ಹೊಸ ರಚನೆಗೆ ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ. ಈ ಕಾರ್ಯವು ಕೇವಲ ಒಮ್ಮೆ ಮಾತ್ರ " +"ಚಲಾಯಿತಗೊಳ್ಳಬೇಕು." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format -#| msgid "Error while saving bookmarks: %s" msgid "Error opening old bookmarks file: %s" msgstr "ಹಳೆಯ ಬುಕ್‌ಮಾರ್ಕುಗಳನ್ನು ತೆರೆಯುವಲ್ಲಿ ದೋಷ: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "ಹಳೆಯ ಬುಕ್‌ಮಾರ್ಕ್ ಕಡತವನ್ನು ತೆಗೆದು ಹಾಕಲಾಗಲಿಲ್ಲ" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "ರೂಟ್‌ ಕಡತಕೋಶ" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "ಈ ಕಡತಕೋಶದ ಅಮಾನ್ಯವಾದ ಹೆಸರು" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "ಹೆಸರು \"%s\" ಅನ್ನು ಈ ಕಡತಕೋಶದಲ್ಲಿ ಈಗಾಗಲೆ ಬಳಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಬೇರೊಂದು ಹೆಸರನ್ನು ಬಳಸಿ." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "ಈ ಅಂಶದ ಅಮಾನ್ಯವಾದ ಹೆಸರು" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(ಪ್ರೊಟೊಕಾಲ್: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "ನೀವು ನಿಜವಾಗಲು ಬುಕ್‌ಮಾರ್ಕಿನಿಂದ %s ಅನ್ನು ತೆಗೆದು ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "ನೀವು ನಿಜವಾಗಲು ಬುಕ್‌ಮಾರ್ಕಿನಿಂದ %s ಅನ್ನು ತೆಗೆದು ಹಾಕಲು ಬಯಸುತ್ತೀರೆ?" -#: ../src/vinagre-bookmarks-ui.c:241 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "ಕಡತಕೋಶವನ್ನು ತೆಗೆದುಹಾಕಬೇಕೆ?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "ಅದರೊಳಿಗಿನ ಎಲ್ಲಾ ಉಪಕಡತಕೋಶಗಳು ಹಾಗು ಅಂಶಗಳು ತೆಗೆಯಲ್ಪಡುತ್ತವೆ ಎಂಬುದನ್ನು ನೆನಪಿಡಿ." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "ಅಂಶವನ್ನು ತೆಗೆದುಹಾಕಬೇಕೆ?" -#: ../src/vinagre-bookmarks-ui.c:264 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "ಬುಕ್‌ಮಾರ್ಕನ್ನು ತೆಗೆದು ಹಾಕುವಲ್ಲಿ ದೋಷ: ನಮೂದು ಕಂಡುಬಂದಿಲ್ಲ" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "ಹೊಸ ಕಡತಕೋಶ" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "ಕಡತವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1156 -msgid "Supported formats" -msgstr "ಬೆಂಬಲವಿರುವ ವಿನ್ಯಾಸಗಳು" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "ಬೆಂಬಲಿತವಾದ ಯಾವುದೆ ಕಡತಗಳಿಲ್ಲ" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "ಸಕ್ರಿಯವಾಗಿರುವ ಯಾವುದೆ ಪ್ಲಗ್‌ಇನ್‌ಗಳು ಬೆಂಬಲಿತ ಕಡತವನ್ನು ತೆರೆಯಲು ಯಾವುದೆ ನೆರವನ್ನು ನೀಡುತ್ತಿಲ್ಲ. ಕೆಲವು ಪ್ಲಗ್‌ಇನ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ ನಂತರ ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "ಈ ಕೆಳಗಿನ ಕಡತವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ:" msgstr[1] "ಈ ಕೆಳಗಿನ ಕಡತಗಳನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ:" -#: ../src/vinagre-connect.c:179 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "ಪ್ರೊಟೊಕಾಲ್‌ ಪಟ್ಟಿಯಲ್ಲಿ ಸಕ್ರಿಯ ಪ್ರೊಟೊಕಾಲ್ ಕಂಡು ಬಂದಿಲ್ಲ." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "ಇತಿಹಾಸ ಕಡತವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ: %s" -#: ../src/vinagre-connect.c:191 -msgid "Choose a VNC Server" -msgstr "ಒಂದು VNC ಪರಿಚಾರಕವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" - -#: ../src/vinagre-connection.c:600 -#, c-format -msgid "The protocol %s is not supported." -msgstr "ಪ್ರೋಟೋಕಾಲ್ %s ಬೆಂಬಲಿತವಾಗಿಲ್ಲ." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "ದೂರಸ್ಥ ಗಣಕತೆರೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" -#: ../src/vinagre-connection.c:695 -#| msgid "Choose the file" +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "ಕಡತವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ." -#: ../src/vinagre-connection.c:714 -#| msgid "Choose the file" -msgid "Could not parse the file." -msgstr "ಕಡತವನ್ನು ಪಾರ್ಸ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ." - -#: ../src/vinagre-connection.c:759 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "'ಹಂಚಲಾದ' ಫ್ಲಾಗಿಗೆ ಸರಿಯಲ್ಲದ ಮೌಲ್ಯ: %d. ಅದು 0 ಅಥವ 1 ಆಗಿರಬೇಕು. ಅದನ್ನು ನಿರ್ಲಕ್ಷಿಸಲಾಗುತ್ತಿದೆ." - -#: ../src/vinagre-connection.c:765 -msgid "Could not find the host address in the file." -msgstr "ಕಡತದಲ್ಲಿ ಅತಿಥೇಐದ ವಿಳಾಸವನ್ನು ಪತ್ತೆಮಾಡಲಾಗಲಿಲ್ಲ." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "ಕಡತವನ್ನು ಯಾವುದೆ ಪ್ಲಗ್‌ಇನ್‌ಗಳಿಂದ ಗುರುತಿಸಲಾಗಿಲ್ಲ." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "ಅಮಾನ್ಯವಾದ ಕಾರ್ಯ" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "ಎಳೆದು ಸೇರಿಸುವ ಕ್ರಿಯೆಯಿಂದ ಪಡೆಯಲಾದ ದತ್ತಾಂಶವು ಅಮಾನ್ಯವಾಗಿದೆ." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "ಸಮೀಪದ ಅತಿಥೇಯಗಳು" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "ಒಂದು .vnc ಕಡತವನ್ನು ತೆರೆಯುತ್ತದೆ" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "ಕಡತದಹೆಸರು" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "vinagre ಅನ್ನು ಸಂಪೂರ್ಣ ತೆರೆಯಲ್ಲಿ ತೆರೆ" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "vinagre ನ ಈಗಿರುವ ಒಂದು ಪ್ರಸಂಗದಲ್ಲಿ ಒಂದು ಹೊಸ ಮೇಲ್ಮಟ್ಟದ ವಿಂಡೋವನ್ನು ನಿರ್ಮಿಸಿ" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "vinagre ನಿಂದ ಗುರುತಿಸಲಾದ ಕಡತವನ್ನು ತೆರೆ" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "ಕಡತದಹೆಸರು" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "ಈ ಕೆಳಗಿನ ದೋಷವು ಸಂಭವಿಸಿದೆ:" msgstr[1] "ಈ ಕೆಳಗಿನ ದೋಷಗಳು ಸಂಭವಿಸಿವೆ:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- GNOME ಗಾಗಿನ VNC ಕ್ಲೈಂಟ್‌" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- ದೂರಸ್ಥ ಗಣಕತೆರೆಗಳ ವೀಕ್ಷಕ" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "ಲಭ್ಯವಿರುವ ಆಜ್ಞಾ ಸಾಲಿನ ಆಯ್ಕೆಗಳ ಸಂಪೂರ್ಣ ಪಟ್ಟಿಗಾಗಿ 'vinagre --help' ಅನ್ನು ಚಲಾಯಿಸಿ" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "avahi ಅತಿಥೇಯದ ಹೆಸರನ್ನು ಪರಿಹರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "ಪ್ಲಗ್‌ಇನ್ %s ಈಗಾಗಲೆ %s ಸೇವೆಗಾಗಿ ಒಂದು ವೀಕ್ಷಕವನ್ನು ನೋಂದಾಯಿಸಿದೆ." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to add mDNS browser for service %s." +msgstr "mDNS ವೀಕ್ಷಕವನ್ನು ಸೇವೆಗೆ ಸೇರಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "ಅತಿಥಿಗಳಿಗಾಗಿ ಹುಡುಕುವುದಕ್ಕೆ ಬೆಂಬಲವಿಲ್ಲ: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -#| msgid "Connection to host \"%s\" was closed." -msgid "Connection to host %s was closed." -msgstr "ಅತಿಥೇಯ %s ದೊಂದಿಗಿನ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ." +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS ವೀಕ್ಷಕವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s\n" -#: ../src/vinagre-notebook.c:170 -#| msgid "Connection to host \"%s\" was closed." +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "ಅತಿಥೇಯ %s ದೊಂದಿಗಿನ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "ಅತಿಥೇಯ %s ದ ದೃಢೀಕರಣವು ವಿಫಲಗೊಂಡಿದೆ" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "ದೃಢೀಕರಣವು ವಿಫಲಗೊಂಡಿದೆ" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:882 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "ಸಂಪರ್ಕವನ್ನು ಮುಚ್ಚು" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "ಪ್ಲಗ್‌ಇನ್‌ ವ್ಯವಸ್ಥಾಪಕ" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "ಪ್ಲಗ್ಇನ್" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "ಸಕ್ರಿಯಗೊಂಡ" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "ಸಂರಚಿಸು(_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "ಸಕ್ರಿಯಗೊಳಿಸು(_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "ಎಲ್ಲವನ್ನೂ ಸಕ್ರಿಯಗೊಳಿಸು(_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "ಎಲ್ಲವನ್ನೂ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು(_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "ಪ್ಲಗ್ಇನ್‍ನ ಬಗ್ಗೆ(_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "ಪ್ಲಗ್ಇನ್ ಅನ್ನು ಸಂರಚಿಸು(_o)" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "ಆದ್ಯತೆಗಳ ನಿರ್ವಾಹಕನನ್ನು ಆರಂಭಿಸಲಾಗಿಲ್ಲ." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "ಅತಿಥೇಯಕ್ಕೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಲ್ಲಿ ದೋಷ." - -#: ../src/vinagre-tab.c:354 -#, c-format -#| msgid "Connection to host \"%s\" was closed." -msgid "Authentication to host %s has failed" -msgstr "ಅತಿಥೇಯ \"%s\"ದ ದೃಢೀಕರಣವು ವಿಫಲಗೊಂಡಿದೆ" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "ಪೂರ್ಣತೆರೆಯಿಂದ ನಿರ್ಗಮಿಸು" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "ದೃಢೀಕರಣವು ವಿಫಲಗೊಂಡಿದೆ" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "ಅತಿಥೇಯ %sಕ್ಕಾಗಿನ ದೃಢೀಕರಣ ವಿಧಾನಕ್ಕೆ ಬೆಂಬಲವಿಲ್ಲ. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "ದೃಢೀಕರಣವು ಬೆಂಬಲಿತವಾಗಿಲ್ಲ" - -#: ../src/vinagre-tab.c:464 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "ಇತ್ತೀಚಿನ ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ." -#: ../src/vinagre-tab.c:496 -#| msgid "Error saving the password on the keyring." -msgid "Error saving the credential on the keyring." -msgstr "ಕೀಲಿ ಸುರುಳಿಯಲ್ಲಿ ಪರಿಚಯವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ." - -#: ../src/vinagre-tab.c:751 ../src/vinagre-tab.c:768 -msgid "Authentication error" -msgstr "ದೃಢೀಕರಣದ ದೋಷ" - -#: ../src/vinagre-tab.c:752 -msgid "A username is required in order to access this machine." -msgstr "ಈ ಗಣಕವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಬಳಕೆದಾರರ ಹೆಸರಿನ ಅಗತ್ಯವಿದೆ." - -#: ../src/vinagre-tab.c:769 -msgid "A password is required in order to access this machine." -msgstr "ಈ ಗಣಕವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಬಳಕೆದಾರರ ಒಂದು ಗುಪ್ತಪದದ ಅಗತ್ಯವಿದೆ." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "ಕೀಲಿ ಸುರುಳಿಯಲ್ಲಿ ಪರಿಚಯಗಳನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ." -#: ../src/vinagre-tab.c:895 -msgid "Minimize window" -msgstr "ವಿಂಡೊವನ್ನು ಕುಗ್ಗಿಸು" - -#: ../src/vinagre-tab.c:910 ../src/vinagre-tab.c:911 -msgid "Scaling" -msgstr "ಅಳತೆ ಬದಲಾವಣೆ" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "ಸಂಪರ್ಕದ ಒಂದು ತೆರೆಚಿತ್ರವನ್ನು ತೆಗೆದುಕೊಳ್ಳಲಾಗಲಿಲ್ಲ." -#: ../src/vinagre-tab.c:920 ../src/vinagre-tab.c:921 -msgid "Read only" -msgstr "ಓದಲು ಮಾತ್ರ" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "ತೆರೆಚಿತ್ರವನ್ನು ಉಳಿಸು" -#. Machine menu -#: ../src/vinagre-tab.c:931 ../src/vinagre-tab.c:932 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "ತೆರೆಚಿತ್ರವನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s ನ ತೆರೆಚಿತ್ರ" -#: ../src/vinagre-tab.c:940 ../src/vinagre-tab.c:941 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del ಅನ್ನು ಕಳುಹಿಸಿ" +#: ../vinagre/vinagre-tab.c:881 +#| msgid "Error saving recent connection." +msgid "Error saving screenshot" +msgstr "ತೆರೆ ಚಿತ್ರವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ" -#: ../src/vinagre-tab.c:1065 -msgid "Desktop Name:" -msgstr "ಗಣಕತೆರೆ ಹೆಸರು:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "ಸೇವಾ ಗುಣವನ್ನು ಪಡೆಯಲು ಅಸಾಧ್ಯವಾಗಿದೆ: %s" -#: ../src/vinagre-tab.c:1067 -msgid "Port:" -msgstr "ಸಂಪರ್ಕಸ್ಥಾನ:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +#| msgid "Failed to create the directory" +msgid "Impossible to create the connection: %s" +msgstr "ಸಂಪರ್ಕವನ್ನು ನಿರ್ಮಿಸಲು ಅಸಾಧ್ಯವಾಗಿದೆ %s" -#: ../src/vinagre-tab.c:1068 -msgid "Dimensions:" -msgstr "ಆಯಾಮಗಳು:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "ಸ್ಟ್ರೀಮ್ ಟ್ಯೂಬ್ ಅನ್ನು ಅಂಗೀರಿಸುವುದು ಅಸಾಧ್ಯ: %s" -#: ../src/vinagre-tab.c:1134 -#| msgid "Take a screenshot of active connection" -msgid "Could not get a screenshot of the connection." -msgstr "ಸಂಪರ್ಕದ ಒಂದು ತೆರೆಚಿತ್ರವನ್ನು ತೆಗೆದುಕೊಳ್ಳಲಾಗಲಿಲ್ಲ." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "ಸಂಪರ್ಕ ಹೆಸರನ್ನು ಪಡೆದುಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s" -#: ../src/vinagre-tab.c:1142 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s ನ ತೆರೆಚಿತ್ರ" +msgid "Impossible to get the avatar: %s" +msgstr "ಅವತಾರವನ್ನು ಪಡೆದುಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s" -#: ../src/vinagre-tab.c:1145 -msgid "Save Screenshot" -msgstr "ತೆರೆಚಿತ್ರವನ್ನು ಉಳಿಸು" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s ನಿಮ್ಮೊಂದಿಗೆ ತನ್ನ ಗಣಕತೆರೆಯನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸಿದ್ದಾರೆ." -#: ../src/vinagre-tab.c:1209 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"ಈ ಅನುಸ್ತಾಪನೆಯಲ್ಲಿ ಗಾತ್ರ ಬದಲಾವಣೆಗೆ(ಸ್ಕೇಲಿಂಗ್‌) ಬೆಂಬಲವಿಲ್ಲ.\n" -"\n" -"ಈ ಸವಲತ್ತನ್ನು ಹೇಗೆ ಶಕ್ತಗೊಳಿಸುವುದು ಎಂಬುದನ್ನು ಅರಿಯಲು README ಕಡತವನ್ನು (Vinagre ನೊಂದಿಗೆ ನೀಡಲಾದ) ಓದಿ." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "ಗಣಕತೆರೆ ಹಂಚಿಕೊಳ್ಳುವ ಆಹ್ವಾನ" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "ಗಣಕ(_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "ಸಂಪಾದನೆ(_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "ನೋಟ(_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳು(_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "ದೂರಸ್ಥ ಗಣಕಕ್ಕೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸು" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "ಒಂದು .VNC ಕಡತವನ್ನು ತೆರೆ" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "ಪ್ರೋಗ್ರಾಂನಿಂದ ಹೊರನಡೆ" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "ಅನ್ವಯದ ಆದ್ಯತೆಗಳನ್ನು ಸಂಪಾದಿಸಿ" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "ಬುಕ್‌ಮಾರ್ಕನ್ನು ತೆರೆ(_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "ಈ ಗಣಕಕ್ಕೆ ಸಂಪರ್ಕ ಕಲ್ಪಿಸು" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "ಬುಕ್‌ಮಾರ್ಕನ್ನು ಸಂಪಾದಿಸು(_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಬುಕ್‌ಮಾರ್ಕಿನ ವಿವರಗಳನ್ನು ಸಂಪಾದಿಸಿ" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳಿಂದ ತೆಗೆದುಹಾಕಿ(_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "ಪ್ರಸಕ್ತ ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಬುಕ್‌ಮಾರ್ಕುಗಳಿಂದ ತೆಗೆದು ಹಾಕಿ" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "ಹೊಸ ಕಡತಕೋಶ(_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "ಒಂದು ಹೊಸ ಕಡತಕೋಶವನ್ನು ನಿರ್ಮಿಸಿ" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "ಒಳವಿಷಯಗಳು(_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "vinagre ಕೈಪಿಡಿಯನ್ನು ತೆರೆ" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "ಈ ಅನ್ವಯದ ಬಗ್ಗೆ" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "ಉಪಕರಣಪಟ್ಟಿ(_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "ಉಪಕರಣಪಟ್ಟಿಯನ್ನು ತೋರಿಸು ಅಥವ ಅಡಗಿಸು" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "ಸ್ಥಿತಿಪಟ್ಟಿ(_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "ಸ್ಥಿತಿಪಟ್ಟಿಯನ್ನು ತೋರಿಸು ಅಥವ ಅಡಗಿಸು" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "ಬದಿಯ ಫಲಕ(_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "ಬದಿಯ ಫಲಕವನ್ನು ತೋರಿಸು ಅಥವ ಅಡಗಿಸು" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "ಪ್ರಸಕ್ತ ಸಂಪರ್ಕವನ್ನು ಮುಚ್ಚು" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "ಎಲ್ಲವನ್ನೂ ಮುಚ್ಚು(_l)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "ಎಲ್ಲಾ ಸಕ್ರಿಯ ಸಂಪರ್ಕಗಳನ್ನು ಮುಚ್ಚು" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "ಬುಕ್‌ಮಾರ್ಕುಗಳಿಗೆ ಸೇರಿಸು(_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "ನಿಮ್ಮ ಬುಕ್‌ಮಾರ್ಕುಗಳಿಗೆ ಪ್ರಸಕ್ತ ಸಂಪರ್ಕವನ್ನು ಸೇರಿಸಿ" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "ತೆರೆಚಿತ್ರವನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕದ ಒಂದು ತೆರೆಚಿತ್ರವನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "ಸಕ್ರಿಯ ಸಂಪರ್ಕಕ್ಕಾಗಿ Ctrl+Alt+Del ಅನ್ನು ಕಳುಹಿಸು" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "ಪ್ರಸಕ್ತ ಗಣಕವನ್ನು ಸಂಪೂರ್ಣತೆರೆಯಲ್ಲಿ ನೋಡು" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "ಮೂಲ ಗಾತ್ರ(_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "ವಿಂಡೋವನ್ನು ದೂರಸ್ಥ ಗಣಕತೆರೆಯ ಗಾತ್ರಕ್ಕೆ ಹೊಂದಿಸುತ್ತದೆ" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "ಗಾತ್ರದ ಹೊಂದಿಕೆ(_c)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "ದೂರಸ್ಥ ತೆರೆಯನ್ನು ಪ್ರಸಕ್ತ ವಿಂಡೋ ಗಾತ್ರಕ್ಕೆ ಸರಿಹೊಂದಿಸು" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "ಓದಲು ಮಾತ್ರ(_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "ಮೌಸ್ ಹಾಗು ಕೀಲಿಮಣೆಯನ್ನು ಅಶಕ್ತಗೊಳಿಸು" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "ಉಪಕರಣಪಟ್ಟಿ(_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "ಉಪಕರಣಪಟ್ಟಿಯನ್ನು ತೋರಿಸು ಅಥವ ಅಡಗಿಸು" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "ಸ್ಥಿತಿಪಟ್ಟಿ(_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "ಸ್ಥಿತಿಪಟ್ಟಿಯನ್ನು ತೋರಿಸು ಅಥವ ಅಡಗಿಸು" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "ಬದಿಯ ಫಲಕ(_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "ಬದಿಯ ಫಲಕವನ್ನು ತೋರಿಸು ಅಥವ ಅಡಗಿಸು" - -#: ../src/vinagre-utils.c:75 -#| msgid "The following error has occurred:" -#| msgid_plural "The following errors have occurred:" +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "ಒಂದು ದೋಷವು ಸಂಭವಿಸಿದೆ:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre ಎನ್ನುವುದು GNOME Desktop ಗಾಗಿನ VNC ಕ್ಲೈಂಟ್ ಆಗಿದೆ" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +#| msgid "Could not open the file." +msgid "Could not load builder file: %s" +msgstr "ನಿರ್ಮಾಣಗಾರ ಕಡತವನ್ನು ಲೋಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s" + +#: ../vinagre/vinagre-utils.c:453 +#| msgid "Vinagre is a VNC client for the GNOME Desktop" +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre ಎನ್ನುವುದು GNOME Desktop ಗಾಗಿನ ದೂರಸ್ಥ ಗಣಕತೆರೆಯನ್ನು ನೋಡುವ ಸಾಧನವಾಗಿದೆ" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -743,7 +955,7 @@ "Foundation; either version 2 of the License, or (at your option) any later " "version." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -755,7 +967,7 @@ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -763,30 +975,26 @@ "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ ಎಂ. ವಿ. " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre ಜಾಲತಾಣ" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml ಅನ್ನು ಒಗ್ಗೂಡಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "ಇತ್ತೀಚಿನ ಸಂಪರ್ಕಗಳು(_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s ಅನ್ನು ತೆರೆ:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "ತೆರೆಸೂಚಕವನ್ನು ಬಿಡುಗಡೆಗೊಳಿಸಲು Ctrl+Alt ಅನ್ನು ಒತ್ತಿ" - diff -Nru vinagre-2.26.1/po/ko.po vinagre-2.29.1/po/ko.po --- vinagre-2.26.1/po/ko.po 2009-03-26 18:20:03.000000000 +0000 +++ vinagre-2.29.1/po/ko.po 2009-08-28 17:21:05.000000000 +0100 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: vinagre\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-24 21:01+0900\n" -"PO-Revision-Date: 2009-03-24 21:02+0900\n" +"POT-Creation-Date: 2009-08-29 00:45+0900\n" +"PO-Revision-Date: 2009-08-29 01:07+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "정보(_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "도움말(_H)" @@ -35,124 +35,118 @@ msgstr "원격 데스크탑 접속" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "원격 데스크탑 보기" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "인증이 필요합니다" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "연결 옵션" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "연결" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "폴더" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "인터페이스" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "옵션" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "상위 폴더" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "어느 컴퓨터에 연결하시겠습니까?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "위의 모든 항목은 필수 항목입니다" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "위의 모든 항목은 필수 항목입니다" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "인증이 필요합니다" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "책갈피" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "연결" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "연결 옵션" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "폴더" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "호스트:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "인터페이스" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "옵션" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "상위 폴더" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "기본 설정" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "사용 중인 연결이 하나밖에 없을 경우에도 탭을 표시할 지 여부" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "어느 컴퓨터에 연결하시겠습니까?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "메뉴 단축 키를 표시할 지 여부" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "항상 탭 표시(_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "인증(_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "전체 화면(_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "호스트(_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "이름(_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "암호(_P):" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "프로토콜(_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "이 암호를 기억(_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "크기 조정(_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "메뉴 바로 가기 표시(_S)" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "사용자 이름(_U):" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "보기만 가능(_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "활성화 플러그인" + +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "활성화한 플러그인 목록. 활성화한 플러그인의 위치(\"Location\")가 들어 있습니다. 주어진 플러그인의 위치(\"Location\")를 보려면 .vinagre-plugin 파일을 참고하십시오." -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "<호스트> 혹은 <호스트>:<디스플레이> 혹은 <호스트>::<포트번호>" - -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "연결 대화 창의 최고 기록 항목 숫자" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -162,7 +156,7 @@ "를 사용합니다. 단축 키를 사용하게 되면 그 키는 메뉴에서 사용하고 원격 호스트" "에 전달하지 않으므로 주의하십시오." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -170,15 +164,15 @@ "\"참\"으로 하면 항상 탭을 표시합니다. \"거짓\"으로 하면 사용 중인 연결이 여" "러 개인 경우에만 탭을 표시합니다." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "호스트 드롭다운 항목의 최대 개수를 지정합니다." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" URL에 대한 핸들러" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -188,10 +182,19 @@ "을 남겨 둘 지 끊을 지 요청합니다. 이 값을 참으로 하면 데스크탑을 다른 클라이" "언트와 같이 사용하게 됩니다." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "연결한 다른 클라이언트를 남겨 둘 지 여부" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "사용 중인 연결이 하나밖에 없을 경우에도 탭을 표시할 지 여부" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "메뉴 단축 키를 표시할 지 여부" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "원격 데스크탑(VNC) 파일" @@ -200,542 +203,743 @@ msgid "Remote Desktop Connection" msgstr "원격 데스크탑 연결" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "유닉스/리눅스 터미널에 연결합니다" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "포트:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH 기능" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"'shared' 플래그의 값이 잘못되었습니다: %d. 이 값은 0이나 1이어야 합니다. 무시" +"합니다." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "크기 조정 모드 사용" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC 옵션:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC 옵션을 표시합니다" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "유닉스/리눅스, 윈도우즈, 기타 컴퓨터에 연결합니다." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "파일을 파싱할 수 없습니다." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "파일이 VNC 파일이 아닙니다. \"connection\" 그룹이 없습니다." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "파일이 VNC 파일이 아닙니다. \"host\" 키가 없습니다." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC 옵션" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "보기만 가능(_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "크기 조정(_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC 파일" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "데스크탑 이름:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "크기:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "호스트에 연결하는 중 오류." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "%s 호스트가 해당 인증 방식을 지원하지 않습니다. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "인증 방식을 지원하지 않습니다" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "인증 오류" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "이 컴퓨터에 연결하려면 사용자 이름이 필요합니다." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "이 컴퓨터에 연결하려면 암호가 필요합니다." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "크기 조정(_C)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "원격 화면을 현재 창 크기에 맞춥니다" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "마우스와 키보드 이벤트를 보내지 않습니다" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "원래 크기(_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "창의 크기를 원격 데스크탑의 크기에 맞게 조절합니다" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del 보내기" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "원격 컴퓨터에 Ctrl+Alt+Del 키를 보냅니다" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "크기 조정" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "읽기 전용" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"이 버전에서는 크기 조정을 지원하지 않습니다.\n" +"\n" +"이 기능을 사용하는 방법을 보려면 비나그레에 들어 있는 README 파일을 보십시오." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC 기능" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "원격 컴퓨터에 빠르게 연결하는 메뉴" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "비나그레 애플릿 팩토리" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "비나그레를 실행할 수 없습니다:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "원격 데스크탑 프로그램 열기" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "책갈피 읽기" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "%s 프로토콜을 지원하지 않습니다." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "책갈피를 초기화하는 중 오류: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "알 수 없는 오류" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "책갈피를 초기화하는 중 오류: 파일이 빈 파일 같습니다" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "책갈피를 초기화하는 중 오류: 파일이 비나그레 책갈피 파일이 아닙니다" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" -msgstr "책갈피를 초기화하는 중 오류: XML 구조를 만드는 데 실패했습니다" +msgstr "책갈피를 초기화하는 중 오류: XML 구조를 만드는데 실패했습니다" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" -msgstr "책갈피를 초기화하는 중 오류: XML 구조를 초기화하는 데 실패했습니다" +msgstr "책갈피를 초기화하는 중 오류: XML 구조를 초기화하는데 실패했습니다" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" -msgstr "책갈피를 초기화하는 중 오류: XML 구조를 마무리하는 데 실패했습니다" +msgstr "책갈피를 초기화하는 중 오류: XML 구조를 마무리하는데 실패했습니다" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "책갈피를 저장하는 중 오류: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" -msgstr "책갈피를 옮기는 중 오류: XML 구조를 만드는 데 실패했습니다" +msgstr "책갈피를 옮기는 중 오류: XML 구조를 만드는데 실패했습니다" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" -msgstr "책갈피를 옮기는 중 오류: XML 구조를 초기화하는 데 실패했습니다" +msgstr "책갈피를 옮기는 중 오류: XML 구조를 초기화하는데 실패했습니다" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" -msgstr "책갈피를 옮기는 중 오류: XML 구조를 마무리하는 데 실패했습니다" +msgstr "책갈피를 옮기는 중 오류: XML 구조를 마무리하는데 실패했습니다" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "책갈피를 옮기는 중 오류: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "책갈피를 옮기는 중 오류: VNC 플러그인을 활성화하지 않았습니다" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" -msgstr "디렉터리를 만드는 데 실패했습니다" +msgstr "디렉터리를 만드는데 실패했습니다" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." msgstr "책갈피를 새 형식으로 옮기는 중입니다. 이 작업은 한 번만 동작합니다." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "예전 책갈피를 여는 중 오류: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "옮기기를 취소했습니다" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "예전 책갈피 파일을 제거할 수 없습니다" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "최상위 폴더" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "이 폴더의 이름이 잘못되었습니다" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." -msgstr "이 폴더에서 \"%s\" 이름은 이미 사용 중입니다. 다른 이름을 사용하십시오." +msgstr "" +"이 폴더에서 \"%s\" 이름은 이미 사용 중입니다. 다른 이름을 사용하십시오." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "이 항목의 이름이 잘못되었습니다" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(프로토콜: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "정말로 %s을(를) 책갈피에서 제외하시겠습니까?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "정말로 '%s'을(를) 책갈피에서 제외하시겠습니까?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "폴더를 제거하시겠습니까?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "아래 폴더와 항목도 모두 제거합니다." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "항목을 제거하시겠습니까?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "책갈피를 제거하는 중 오류: 항목이 없습니다" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "새 폴더" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "파일을 선택하십시오" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "지원하는 형식" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "지원하는 파일이 없습니다" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "활성화한 플러그인 중에서 파일 열기를 지원하는 플러그인이 없습니다. 플러그인을 활성화한 다음 다시 시도하십시오." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "다음 파일은 열 수 없습니다:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "프로토콜 목록에서 프로토콜을 가져올 수 없습니다." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "기록 파일을 저장하는 중 오류: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "VNC 서버를 선택하십시오" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "%s 프로토콜을 지원하지 않습니다." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "원격 데스크탑 선택" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "파일을 열 수 없습니다." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "파일을 파싱할 수 없습니다." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "이 파일을 인식하는 플러그인이 없습니다." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"'shared' 플래그의 값이 잘못되었습니다: %d. 이 값은 0이나 1이어야 합니다. 무시" -"합니다." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "파일에서 호스트 주소를 찾을 수 없습니다." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "잘못된 동작" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "끌어놓기 동작에서 받은 데이터가 올바르지 않습니다." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "주변 호스트" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr ".vnc 파일 열기" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "파일 이름" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "비나그레를 전체 화면 모드에서 엽니다" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "기존의 비나그레 프로그램에서 최상위 창을 새로 만듭니다." -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "비나그레가 인식하는 파일을 엽니다" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "파일 이름" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[서버:포트]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "다음 오류가 발생했습니다:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- 그놈 VNC 클라이언트" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- 원격 데스크탑 보기" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "이용 가능한 전체 명령행 옵션을 보려면 'vinagre --help'를 실행하십시오" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" -msgstr "아바히 호스트 이름을 찾는 데 실패했습니다: %s\n" +msgstr "아바히 호스트 이름을 찾는데 실패했습니다: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "%s 플러그인은 이미 %s 서비스 브라우저로 등록되어 있습니다." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "%s 서비스에 대한 mDNS 브라우저를 추가하는데 실패했습니다." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" -msgstr "호스트를 찾아보는 데 실패했습니다: %s\n" +msgstr "호스트를 찾아보는데 실패했습니다: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -msgid "Connection to host %s was closed." -msgstr "%s 호스트에 대한 연결이 끊겼습니다." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS 브라우저를 초기화하는데 실패했습니다: %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "'%s' 호스트에 대한 연결이 끊겼습니다." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "연결이 끊겼습니다" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "'%s' 호스트에 대한 인증이 실패했습니다" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "인증이 실패했습니다" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "연결하는 중..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "연결 끊기" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "플러그인 관리자" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "플러그인" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "사용" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "설정(_O)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "활성화(_C)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "모두 활성화(_T)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "모두 비활성화(_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "플러그인 정보(_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "플러그인 설정(_O)" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "설정 관리자를 초기화할 수 없습니다." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "호스트에 연결하는 중 오류." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "%s 호스트에 대한 인증이 실패했습니다" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "인증이 실패했습니다" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "전체 화면 나가기" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "%s 호스트가 해당 인증 방식을 지원하지 않습니다. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "인증 방식을 지원하지 않습니다" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "최근 연결을 저장하는 중 오류." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "키 모음에 암호를 저장하는 중 오류." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "인증 오류" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "이 컴퓨터에 연결하려면 사용자 이름이 필요합니다." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "이 컴퓨터에 연결하려면 암호가 필요합니다." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "창 최소화" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "크기 조정" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "해당 연결의 스크린샷을 찍을 수 없습니다." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "읽기 전용" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "스크린샷 저장" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "스크린샷 찍기" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s의 스크린샷" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del 보내기" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "스크린샷을 저장하는 중 오류." -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "데스크탑 이름:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "서비스 속성을 가져올 수 없습니다: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "포트:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "연결을 만들 수 없습니다: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "크기:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "스트림을 받아들일 수 없습니다: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "해당 연결의 스크린샷을 찍을 수 없습니다." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "연락처 이름을 가져올 수 없습니다: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s의 스크린샷" +msgid "Impossible to get the avatar: %s" +msgstr "아바타를 가져올 수 없습니다: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "스크린샷 저장" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s 사용자가 자기 데스크탑을 공유하고 싶어 합니다." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"이 버전에서는 크기 조정을 지원하지 않습니다.\n" -"\n" -"이 기능을 사용하는 방법을 보려면 비나그레에 들어 있는 README 파일을 보십시오." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "데스크탑 공유 초대" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "컴퓨터(_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "편집(_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "보기(_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "책갈피(_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "원격 컴퓨터에 연결합니다" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr ".VNC 파일 열기" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "프로그램 끝내기" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "프로그램 기본 설정을 편집합니다" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "책갈피 열기(_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "이 컴퓨터에 연결합니다" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "책갈피 편집(_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "선택한 책갈피의 정보를 편집합니다" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "책갈피에서 제거(_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "현재 선택한 연결을 책갈피에서 제거합니다" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "새 폴더(_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "새 폴더를 만듭니다" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "차례(_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "비나그레 설명서 열기" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "프로그램 정보" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "도구 모음(_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "도구 모음을 보이거나 숨깁니다" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "상태 표시줄(_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "상태 표시줄을 보이거나 숨깁니다" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "가장자리 패널(_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "가장자리 패널을 보이거나 숨깁니다" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "현재 연결 끊기" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "모두 닫기(_L)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "모든 활성화된 연결을 닫습니다" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "책갈피에 추가(_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "현재 연결을 책갈피에 추가합니다" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "스크린샷 찍기" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "활성화된 연결의 스크린샷을 찍습니다" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "현재 연결에 Ctrl+Alt+Del 키를 보냅니다" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "현재 컴퓨터를 전체 화면으로 봅니다" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "원래 크기(_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "창의 크기를 원격 데스크탑의 크기에 맞게 조절합니다" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "크기 조정(_C)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "원격 화면을 현재 창 크기에 맞춥니다" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "읽기 전용(_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "마우스와 키보드를 사용하지 않습니다" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "도구 모음(_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "도구 모음을 보이거나 숨깁니다" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "상태 표시줄(_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "상태 표시줄을 보이거나 숨깁니다" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "가장자리 패널(_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "가장자리 패널을 보이거나 숨깁니다" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "오류가 발생했습니다:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "비나그레는 그놈 데스크탑을 위한 VNC 클라이언트입니다" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "빌더 파일을 열 수 없습니다: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "비나그레는 그놈 데스크탑을 위한 원격 데스크탑 프로그램입니다" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -746,7 +950,7 @@ "단이 공표한 GNU 일반 공중 사용 허가서 2판 또는 그 이후 판을 임의로 선택해서, " "그 규정에 따라 프로그램을 개작하거나 재배포할 수 있습니다." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -758,7 +962,7 @@ "한 어떠한 형태의 보증도 제공하지 않습니다. 보다 자세한 사항에 대해서는 GNU 일" "반 공중 사용 허가서를 참고하시기 바랍니다." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -766,89 +970,27 @@ "GNU 일반 공중 사용 허가서는 이 프로그램과 함께 제공됩니다. 만약, 이 문서가 누" "락되어 있다면 를 살펴보기 바랍니다." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "김남형 \n" "류창우 " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "비나그레 웹사이트" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml 파일을 합칠 수 없음: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "최근 연결(_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s:%d 열기" - -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "커서를 놓으려면 Ctrl+Alt 키를 누르십시오" - -#~ msgid "Editing a bookmark" -#~ msgstr "책갈피 편집" - -#~ msgid "Enter a name for this connection" -#~ msgstr "이 연결의 이름 입력" - -#~ msgid "" -#~ "In order to connect on this machine, a password is required. Please " -#~ "supply it." -#~ msgstr "" -#~ "이 컴퓨터에 연결하려면 암호가 필요합니다. 암호를 입력하십시오." - -#~ msgid "Editing a bookmark" -#~ msgstr "책갈피 편집" - -#~ msgid "Saving to bookmarks" -#~ msgstr "책갈피로 저장" - -#~ msgid "_Bookmark name:" -#~ msgstr "책갈피 이름(_B):" - -#~ msgid "Error: %s" -#~ msgstr "오류: %s" - -#~ msgid "Confirm removal?" -#~ msgstr "정말로 제거하시겠습니까?" - -#~ msgid "Error while removing %s from bookmarks: %s" -#~ msgstr "책갈피에서 %s을(를) 제거하는 중 오류: %s" - -#~ msgid "" -#~ "Scaling does not work properly on composited windows. Disable the visual " -#~ "effects and try again." -#~ msgstr "" -#~ "컴포지트 창에서는 크기 조정이 동작하지 않습니다. 시각 효과를 끄고 다시 해 " -#~ "보십시오." - -#~ msgid "_Port:" -#~ msgstr "포트(_P):" - -#~ msgid "Image" -#~ msgstr "이미지" - -#~ msgid "Name" -#~ msgstr "이름" - -#~ msgid "Hide bookmarks" -#~ msgstr "책갈피 숨기기" - -#~ msgid "Expected `%s' got `%s' for key %s" -#~ msgstr "`%3$s' 키의 값 `%2$s' (예상 `%1$s')" - -#~ msgid "Press Ctrl+Alt to grab the cursor" -#~ msgstr "커서를 잡으려면 Ctrl+Alt 키를 누르십시오" - -#~ msgid "Could not initialize GnomeVFS\n" -#~ msgstr "GnomeVFS를 초기화할 수 없음\n" diff -Nru vinagre-2.26.1/po/LINGUAS vinagre-2.29.1/po/LINGUAS --- vinagre-2.26.1/po/LINGUAS 2009-03-17 00:19:13.000000000 +0000 +++ vinagre-2.29.1/po/LINGUAS 2009-09-30 17:53:19.000000000 +0100 @@ -4,8 +4,10 @@ ast be@latin bg +bn bn_IN ca +ca@valencia cs da de @@ -16,6 +18,7 @@ eu fi fr +ga gl gu he @@ -28,6 +31,7 @@ ku lt lv +mai mk ml mr diff -Nru vinagre-2.26.1/po/lt.po vinagre-2.29.1/po/lt.po --- vinagre-2.26.1/po/lt.po 2009-04-04 12:06:52.000000000 +0100 +++ vinagre-2.29.1/po/lt.po 2009-09-17 15:20:20.000000000 +0100 @@ -6,11 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: vinagre\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-20 20:31+0000\n" -"PO-Revision-Date: 2009-03-31 15:12+0300\n" -"Last-Translator: Vytautas Rėkus \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-10 14:58+0300\n" +"PO-Revision-Date: 2009-09-10 14:58+0300\n" +"Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,11 +18,11 @@ "100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Apie" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Žinynas" @@ -32,124 +31,118 @@ msgstr "Junkitės prie nutolusių darbastalių" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Nutolusių darbastalių rodymo programa" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Reikalingas atpažinimas" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Prisijungimo nustatymai" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Ryšys" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Aplankas" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Sąsaja" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Nustatymai" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Aukštesnysis aplankas" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Prie kurio kompiuterio norite prisijungti?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Visi laukeliai aukščiau yra reikalingi" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Visi aukščiau esantys langeliai privalomi" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Reikalingas atpažinimas" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Žymelės" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Prisijungimas" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Prisijungimo nustatymai" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Aplankas" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Kompiuteris:" -#: ../data/vinagre.glade.h:12 -msgid "Preferences" +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Sąsaja" + +#: ../data/vinagre.ui.h:9 +msgid "Options" msgstr "Nustatymai" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "Ar rodyti korteles, kai yra tik vienas aktyvus prisijungimas" +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Aukštesnysis aplankas" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Ar rodyti meniu greituosius klavišus" +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "Nustatymai" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Prie kurio kompiuterio norite prisijungti?" + +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "Vis_ada rodyti korteles" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Patvirtinti tapatybę" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Visame ekrane" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Kompiuteris:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Vardas:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Slaptažodis:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokolas:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Atsiminti šį kredencialą" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Mastelis" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "Rodyti meniu šaukiniu_s" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "Naudotojo _vardas:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Tik rodymas" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Aktyvūs įskiepiai" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "kompiuteris arba kompiuteris:ekranas arba kompiuteris::prievadas" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Maksimalus istorijos įrašų skaičius prisijungimo dialoge" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -159,7 +152,7 @@ "Nustatykite „true“, jei norite juos įjungti. Jei šie klavišai įjungti, jie " "bus perimti vietinio lango ir nebus išsiųsti nutolusiam kompiuteriui." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -168,16 +161,16 @@ "Nustatykite „false“, jei norite rodyti korteles tik jei yra daugiau negu " "vienas aktyvus prisijungimas." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "" "Nustato maksimalų siūlomų elementų skaičių kompiuterio pasirinkimo lauke." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" adresų apdorojimo programa" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -187,10 +180,19 @@ "arba palikti juos prijungtus. Nustatykite „ŧrue“, jei norite dalintis " "darbastalį su kitais klientais." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Ar palikti kitus klientus prijungtus" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Ar rodyti korteles, kai yra tik vienas aktyvus prisijungimas" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Ar rodyti meniu greituosius klavišus" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Nutolusio darbastalio (VNC) failas" @@ -199,90 +201,270 @@ msgid "Remote Desktop Connection" msgstr "Prisijungimas prie nutolusio darbastalio" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Prisijungti prie Unix/Linux terminalų" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Prievadas:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH palaikymas" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Netinkama „bendrintos“ gairelės reikšmė: %d. Turėtų būti 0 arba 1. " +"Ignoruojama." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC parinktys:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Rodyti VNC parinktis" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Prisijungti prie Unix/Linux, Windows ir kitų kompiuterių." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Nepavyko apdoroti failo." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC parinktys" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Tik rodymas" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Mastelis" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC failai" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Darbastalio pavadinimas:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Išmatavimai:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Klaida jungiantis prie kompiuterio" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Autentikacijos metodas kompiuteryje %s nepalaikomas. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Atpažinimas nepalaikomas" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Atpažinimo klaida" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Prieigai prie šios mašinos reikia naudotojo vardo." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Prieigai prie šios mašinos reikia slaptažodžio." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "_Mastelis" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Pritaiko nutolusį ekraną prie esamo lango dydžio" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Nesiunčia pelės ir klaviatūros įvykių" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Pradinis dydis" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Langas priderinamas prie nuotolinio darbastalio dydžio" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Siųsti Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Siunčia Ctrl+Alt+Del į nuotolinį kompiuterį" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Mastelis" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Tik skaitymui" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Šis įdiegimas nepalaiko mastelio keitimo.\n" +"\n" +"Skaitykite README failą (pridėtą prie Vinagre), jei norite sužinoti, " +"kaipįjungti šią galimybę." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC palaikymas" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Meniu greitai prieigai prie nutolusių kompiuterių" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre įtaiso gamykla" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Nepavyko paleisti vinagre" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Atverti nutolusių darbastalių rodymo programą" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Rodyti žymeles" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokolas %s nepalaikomas." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Klaida inicializuojant žymeles: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Nežinoma klaida" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Klaida inicializuojant žymeles: failas tuščias" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "Klaida inicializuojant žymeles: tai ne vinagre žymelių failas" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Klaida įrašant žymeles: nepavyko sukurti XML struktūros" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Klaida įrašant žymeles: nepavyko inicijuoti XML struktūros" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Klaida įrašant žymeles: nepavyko finalizuoti XML struktūros" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Klaida įrašant žymeles: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Klaida perkeliant žymeles: nepavyko sukurti XML struktūros" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Klaida perkeliant žymeles: nepavyko inicijuoti XML struktūros" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Klaida perkeliant žymeles: nepavyko finalizuoti XML struktūros" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Klaida perkeliant žymeles: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Klaida perkeliant žymeles: VNC įskiepis neįjungtas" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Klaida sukuriant katalogą" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -290,144 +472,153 @@ "Žymelių failas perkeliamas nauju formatu. Tai turėtų būti vienkartinė " "operacija." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Klaida atveriant senąjį žymelių failą: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Perkėlimas nutrauktas" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Nepavyko pašalinti senojo žymelių failo" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Šakninis aplankas" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Neteisingas pavadinimas šiam aplankui" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." msgstr "" "Pavadinimas „%s“ šiame aplanke jau naudojamas. Pasirinkite kitą pavadinimą." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Netinkamas pavadinimas šiam objektui" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokolas: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Ar tikrai norite pašalinti %s iš žymelių?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Ar tikrai norite pašalinti %s iš žymelių?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Pašalinti aplanką?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "" "Turėkite omenyje, kad visi poaplankiai ir elementai tai pat bus pašalinti." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Pašalinti elementą?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Klaida šalinant žymeles: įrašas nerastas" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Naujas aplankas" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Pasirinkite failą" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Palaikomi formatai" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Nepavyko atverti failo:" msgstr[1] "Nepavyko atverti failų:" msgstr[2] "Nepavyko atverti failų:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "" + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Klaida įrašant istorijos failą: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Pasirinkite VNC serverį" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokolas %s nepalaikomas." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Pasirinkite nutolusį darbastalį" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Nepavyko atverti failo." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Nepavyko apdoroti failo." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." msgstr "" -"Netinkama „bendrintos“ gairelės reikšmė: %d. Turėtų būti 0 arba 1. " -"Ignoruojama." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Faile nerastas kompiuterio adresas." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Neteisinga operacija" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Nutempimo operacijos metu gauti duomenys neteisingi." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Kompiuteriai netoliese" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Atveria .vnc failą" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Atverti vinagre pilname ekrane" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "failo pavadinimas" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Kurti naują viršutinį langą esamame vinagre egzemplioriuje" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Atverti failą, atpažįstamą vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "failo pavadinimas" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[serveris:prievadas]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Įvyko klaida:" @@ -435,317 +626,328 @@ msgstr[2] "Įvyko klaidos:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- VNC klientas GNOME aplinkai" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Nutolusių darbastalių rodymo programa" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Įvykdykite 'vinagre --help', jei norite pamatyti galimų komandinės eilutės " "parametrų sąrašą." -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Nepavyko rasti avahi vardo: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "" + +#: ../vinagre/vinagre-mdns.c:211 +#, fuzzy, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Nepavyko naršyti tinklo: %s\n" + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Nepavyko naršyti tinklo: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Nepavyko paleisti mDNS naršyklės: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Ryšys su kompiuteriu %s užvertas." +msgid "Connection to host %s was closed." +msgstr "Ryšys su kompiuteriu %s užvertas." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Ryšys užvertas" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Autentikacija kompiuteryje %s nepavyko" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Atpažinimas nepavyko" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Jungiamasi..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Atsijungti" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Įskiepių valdyklė" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Įskiepis" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Įjungta" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Konfigūruoti" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Aktyvuoti" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Aktyvuoti _visus" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Deaktyvuoti visus" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Apie įskiepį" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "_Konfigūruoti įskiepį" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Nepavyko inicializuoti nustatymų valdyklės." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Klaida jungiantis prie kompiuterio" - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Atpažinimas kompiuteryje %s nepavyko" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "_Palikti visą ekraną" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Atpažinimas nepavyko" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Atpažinimo metodas kompiuteryje %s nepalaikomas. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Atpažinimas nepalaikomas" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Klaida įrašant naują prisijungimą." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Klaida įrašant kredencialus į raktinę." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Atpažinimo klaida" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Prieigai prie šios mašinos reikia naudotojo vardo." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Prieigai prie šios mašinos reikia slaptažodžio." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Sumažinti langą" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Mastelis" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Nepavyko gauti ryšio ekrano momentinės kopijos." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Tik skaitymui" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Įrašyti ekrano nuotrauką" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Padaryti ekrano nuotrauką" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s ekrano nuotrauka" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Siųsti Ctrl-Alt-Del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Klaida įrašant ekrano nuotrauką" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Darbastalio pavadinimas:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Prievadas:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, fuzzy, c-format +msgid "Impossible to create the connection: %s" +msgstr "Klaida sukuriant katalogą" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Išmatavimai:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Nepavyko gauti ryšio ekrano momentinės kopijos." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s ekrano nuotrauka" +msgid "Impossible to get the avatar: %s" +msgstr "" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Įrašyti ekrano nuotrauką" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s nori jums rodyti savo darbastalį." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Šis įdiegimas nepalaiko mastelio keitimo.\n" -"\n" -"Skaitykite README failą (pridėtą prie Vinagre), jei norite sužinoti, " -"kaipįjungti šią galimybę." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Darbastalio dalijimosi kvietimas" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Kompiuteris" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Keisti" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Rodymas" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "Ž_ymelės" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Prisijungti prie nutolusio kompiuterio" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Atverti .VNC failą" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Uždaryti programą" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Keisti programos nustatymus" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Atverti žymelę" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Prisijungti prie šio kompiuterio" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Keisti žymelę" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Keisti pasirinktos žymelės savybes" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Pašalinti iš žymelių" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Pašalinti pasirinktą prisijungimą iš žymelių" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Naujas aplankas" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Sukurti naują aplanką" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Turinys" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Atverti vinagre žinyną" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Apie šią programą" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Į_rankių juosta" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Rodyti arba slėpti įrankių juostą" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Būsenos eilutė" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Rodyti arba slėpti būsenos eilutę" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Šoninis skydelis" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Rodyti arba slėpti šoninį skydelį" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Uždaryti esamą prisijungimą" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Užverti visus" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Uždaryti visus esamus prisijungimus" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Pridėti prie žymelių" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Pridėti esamą prisijungimą prie žymelių" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Padaryti ekrano nuotrauką" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Padaryti aktyvaus prisijungimo ekrano nuotrauką" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Uždaryti visus esamus prisijungimus" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Rodyti šį kompiuterį visame ekrane" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Pradinis dydis" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Langas priderinamas prie nuotolinio darbastalio dydžio" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "_Mastelis" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Pritaikyti nutolusį ekraną prie esamo lango dydžio" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "Tik _skaitymui" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Išjungti pelę ir klaviatūrą" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Į_rankių juosta" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Rodyti arba slėpti įrankių juostą" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Būsenos eilutė" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Rodyti arba slėpti būsenos eilutę" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_Šoninis skydelis" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Rodyti arba slėpti šoninį skydelį" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Įvyko klaida:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre yra VNC klientas GNOME aplinkai" +#: ../vinagre/vinagre-utils.c:150 +#, fuzzy, c-format +msgid "Could not load builder file: %s" +msgstr "Nepavyko atverti failo." -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre yra nuotolinių darbastalių rodymo programa GNOME aplinkai" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -757,7 +959,7 @@ "BendrosiosViešosios licenzijos sąlygomis: 2 licenzijos versija, arba " "(savonuožiūra) bet kuria vėlesne versija." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -768,7 +970,7 @@ "jokios numanomos PERKAMUMO ar TINKAMUMO KONKRETIEMSTIKSLAMS garantijos. " "Žiūrėkite GNU Bendrąją Viešąją licenziją norėdamisužinoti smulkmenas." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -776,32 +978,64 @@ "Jūs turėjote kartu su šia programa gauti ir GNU Bendrosios " "Viešosioslicenzijos kopija; jei ne, žiūrėkite ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "Gintautas Miliauskas " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre tinklalapis" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Nepavyko sulieti vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Vėliausi prisijungimai" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Atverti %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Paspauskite Vald+Alt, jei norite išlaisvinti kursorių" +#~ msgid "Connection" +#~ msgstr "Ryšys" + +#~ msgid "Folder" +#~ msgstr "Aplankas" + +#~ msgid "host or host:display or host::port" +#~ msgstr "kompiuteris arba kompiuteris:ekranas arba kompiuteris::prievadas" + +#~ msgid "Supported formats" +#~ msgstr "Palaikomi formatai" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Pasirinkite VNC serverį" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "Faile nerastas kompiuterio adresas." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Atveria .vnc failą" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- VNC klientas GNOME aplinkai" + +#~ msgid "Error saving the credential on the keyring." +#~ msgstr "Klaida įrašant kredencialus į raktinę." + +#~ msgid "Minimize window" +#~ msgstr "Sumažinti langą" + +#~ msgid "_Read only" +#~ msgstr "Tik _skaitymui" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Paspauskite Vald+Alt, jei norite išlaisvinti kursorių" #~ msgid "Editing a bookmark" #~ msgstr "Keičiama žymelė" @@ -841,9 +1075,6 @@ #~ "Mastelio keitimas neveikia su komponuojamais langais. Išjunkite " #~ "vizualinius efektus ir bandykite dar kartą." -#~ msgid "_Port:" -#~ msgstr "_Prievadas:" - #~ msgid "Image" #~ msgstr "Paveikslėlis" diff -Nru vinagre-2.26.1/po/mai.po vinagre-2.29.1/po/mai.po --- vinagre-2.26.1/po/mai.po 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/po/mai.po 2009-09-30 17:53:19.000000000 +0100 @@ -0,0 +1,964 @@ +# translation of vinagre.master.po to Maithili +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Sangeeta Kumari , 2009. +msgid "" +msgstr "" +"Project-Id-Version: vinagre.master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" +"POT-Creation-Date: 2009-09-10 12:15+0000\n" +"PO-Revision-Date: 2009-09-11 20:53+0530\n" +"Last-Translator: Sangeeta Kumari \n" +"Language-Team: Maithili \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\n" +"X-Generator: KBabel 1.11.4\n" + +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 +msgid "_About" +msgstr "क' संबंधमे (_A)" + +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 +msgid "_Help" +msgstr "मद्दति (_H)" + +#: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 +msgid "Access remote desktops" +msgstr "" + +#: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 +msgid "Remote Desktop Viewer" +msgstr "" + +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "" + +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 +msgid "Bookmarks" +msgstr "पुस्तकचिह्न" + +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "कनेक्शन" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "फोल्डर" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 +msgid "Host:" +msgstr "होस्ट:" + +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "अंतरफलक" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "विकल्प" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "पेरेन्ट फोल्डर " + +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "वरीयतासभ" + +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "" + +#: ../data/vinagre.ui.h:13 +msgid "_Always show tabs" +msgstr "" + +#. This is a button label, in the authentication dialog +#: ../data/vinagre.ui.h:15 +msgid "_Authenticate" +msgstr "सत्यापित कएल (_A)" + +#: ../data/vinagre.ui.h:16 +msgid "_Full screen" +msgstr "" + +#: ../data/vinagre.ui.h:17 +msgid "_Host:" +msgstr "मेजबान (_H):" + +#: ../data/vinagre.ui.h:18 +msgid "_Name:" +msgstr "नाम (_N):" + +#: ../data/vinagre.ui.h:19 +msgid "_Password:" +msgstr "कूटशब्द (_P):" + +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "" + +#: ../data/vinagre.ui.h:21 +msgid "_Remember this credential" +msgstr "" + +#: ../data/vinagre.ui.h:22 +msgid "_Show menu shortcuts" +msgstr "" + +#: ../data/vinagre.ui.h:23 +msgid "_Username:" +msgstr "प्रयोक्ता नाम (_U):" + +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "प्लगिन सक्रिय" + +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:3 +msgid "Maximum number of history items in connect dialog" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:4 +msgid "" +"Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " +"Note that if they are enabled, those keys will be intercepted by the menu " +"and will not be sent to the remote host." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:5 +msgid "" +"Set to \"true\" to always show the tabs. Set to \"false\" to only show the " +"tabs when there is more than one active connection." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:6 +msgid "Specifies the maximum number of items in the host dropdown entry." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:7 +msgid "The handler for \"vnc://\" URLs" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:8 +msgid "" +"When connecting to a host, the client can say to the server to leave other " +"clients connected or to drop the existent connections. Set the value to true " +"to share the desktop with the other clients." +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:9 +msgid "Whether we should leave other clients connected" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "" + +#: ../data/vinagre-mime.xml.in.h:1 +msgid "Remote Desktop (VNC) file" +msgstr "" + +#: ../data/vinagre-mime.xml.in.h:2 +msgid "Remote Desktop Connection" +msgstr "" + +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "पोर्टः" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "आयाम:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "मापन" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "सिर्फ पढ़बाक लेल" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 +msgid "A menu to quickly access remote machines" +msgstr "" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 +msgid "Vinagre Applet Factory" +msgstr "" + +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 +msgid "Could not run vinagre:" +msgstr "" + +#: ../vinagre/vinagre-applet.c:380 +msgid "Open Remote Desktop Viewer" +msgstr "" + +#: ../vinagre/vinagre-applet.c:435 +msgid "Access your bookmarks" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:343 +#, c-format +msgid "Error while initializing bookmarks: %s" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 +msgid "Unknown error" +msgstr "अज्ञात त्रुटि" + +#: ../vinagre/vinagre-bookmarks.c:350 +msgid "Error while initializing bookmarks: The file seems to be empty" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:357 +msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 +msgid "Error while saving bookmarks: Failed to create the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 +msgid "Error while saving bookmarks: Failed to initialize the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:449 +msgid "Error while saving bookmarks: Failed to finalize the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks.c:458 +#, c-format +msgid "Error while saving bookmarks: %s" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 +msgid "Error while migrating bookmarks: Failed to create the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 +msgid "Error while migrating bookmarks: Failed to initialize the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:125 +msgid "Error while migrating bookmarks: Failed to finalize the XML structure" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 +#, c-format +msgid "Error while migrating bookmarks: %s" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 +msgid "Failed to create the directory" +msgstr "निर्देशिका बनएबामे विफल" + +#: ../vinagre/vinagre-bookmarks-migration.c:262 +msgid "" +"Migrating the bookmarks file to the new format. This operation is only " +"supposed to run once." +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:270 +#, c-format +msgid "Error opening old bookmarks file: %s" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 +msgid "Migration cancelled" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-migration.c:280 +msgid "Could not remove the old bookmarks file" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-tree.c:120 +msgid "Root Folder" +msgstr "रूट फोल्डर" + +#: ../vinagre/vinagre-bookmarks-ui.c:78 +msgid "Invalid name for this folder" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "नाम \"%s\" क' उपयोग एहि फ़ोल्डरमे पहिनेसँ भ' रहल अछि. कृपया भिन्न नामक उपयोग करू." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 +msgid "Remove Folder?" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:315 +msgid "Notice that all its subfolders and items will be removed as well." +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:320 +msgid "Remove Item?" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:337 +msgid "Error removing bookmark: Entry not found" +msgstr "" + +#: ../vinagre/vinagre-bookmarks-ui.c:354 +msgid "New Folder" +msgstr "नवीन फोल्डर" + +#: ../vinagre/vinagre-commands.c:120 +msgid "Choose the file" +msgstr "" + +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" + +#: ../vinagre/vinagre-commands.c:181 +msgid "The following file could not be opened:" +msgid_plural "The following files could not be opened:" +msgstr[0] "" +msgstr[1] "" + +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "" + +#: ../vinagre/vinagre-connect.c:313 +#, c-format +msgid "Error while saving history file: %s" +msgstr "" + +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "" + +#: ../vinagre/vinagre-connection.c:627 +msgid "Could not open the file." +msgstr "" + +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "" + +#: ../vinagre/vinagre-fav.c:670 +msgid "Invalid operation" +msgstr "" + +#: ../vinagre/vinagre-fav.c:671 +msgid "Data received from drag&drop operation is invalid." +msgstr "" + +#: ../vinagre/vinagre-fav.c:871 +msgid "Hosts nearby" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 +msgid "Create a new toplevel window in an existing instance of vinagre" +msgstr "" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "फाइलनाम" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 +msgid "[server:port]" +msgstr "" + +#: ../vinagre/vinagre-main.c:130 +msgid "The following error has occurred:" +msgid_plural "The following errors have occurred:" +msgstr[0] "नीच्चाँ देल गेल त्रुटि भेल:" +msgstr[1] "नीच्चाँ देल गेल त्रुटि भेल:" + +#. Setup command line options +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "" + +#: ../vinagre/vinagre-main.c:193 +msgid "Run 'vinagre --help' to see a full list of available command line options" +msgstr "" + +#: ../vinagre/vinagre-mdns.c:144 +#, c-format +msgid "Failed to resolve avahi hostname: %s\n" +msgstr "" + +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "" + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "" + +#: ../vinagre/vinagre-mdns.c:227 +#, c-format +msgid "Failed to browse for hosts: %s\n" +msgstr "" + +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "" + +#: ../vinagre/vinagre-notebook.c:463 +msgid "Connection closed" +msgstr "" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "सत्यापन असफल" + +#: ../vinagre/vinagre-notebook.c:525 +msgid "Connecting..." +msgstr "कनेक्ट कए रहल अछि...." + +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 +msgid "Close connection" +msgstr "" + +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "प्लगिन प्रबंधक" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "प्लगिन" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "सक्षम" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "कॉन्फ़िगर करू (_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "सक्रिय करू (_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "सबहि सक्रिय करू (_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "सबहि निष्क्रिय करू (_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "प्लगइन क' संबंधमे (_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "प्लगइन कॉन्फ़िगर करू (_o)" + +#: ../vinagre/vinagre-prefs.c:227 +msgid "Cannot initialize preferences manager." +msgstr "वरीयता प्रबंधक प्रारंभ नहि कए सकत." + +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "" + +#: ../vinagre/vinagre-tab.c:495 +msgid "Error saving recent connection." +msgstr "" + +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "" + +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "" + +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "स्क्रीनशॉट सहेजू" + +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "" + +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "" + +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "" + +#. Toplevel +#: ../vinagre/vinagre-ui.h:33 +msgid "_Machine" +msgstr "" + +#: ../vinagre/vinagre-ui.h:34 +msgid "_Edit" +msgstr "संपादन (_E)" + +#: ../vinagre/vinagre-ui.h:35 +msgid "_View" +msgstr "देखू (_V)" + +#: ../vinagre/vinagre-ui.h:36 +msgid "_Bookmarks" +msgstr "पुस्तकचिह्न (_B)" + +#: ../vinagre/vinagre-ui.h:41 +msgid "Connect to a remote machine" +msgstr "" + +#: ../vinagre/vinagre-ui.h:43 +msgid "Open a .VNC file" +msgstr "" + +#: ../vinagre/vinagre-ui.h:45 +msgid "Quit the program" +msgstr "प्रोग्राम सँ बाहर जाउ" + +#: ../vinagre/vinagre-ui.h:49 +msgid "Edit the application preferences" +msgstr "" + +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. +#. Bookmarks menu +#: ../vinagre/vinagre-ui.h:56 +msgid "_Open bookmark" +msgstr "" + +#: ../vinagre/vinagre-ui.h:57 +msgid "Connect to this machine" +msgstr "" + +#: ../vinagre/vinagre-ui.h:58 +msgid "_Edit bookmark" +msgstr "" + +#: ../vinagre/vinagre-ui.h:59 +msgid "Edit the details of selected bookmark" +msgstr "" + +#: ../vinagre/vinagre-ui.h:60 +msgid "_Remove from bookmarks" +msgstr "" + +#: ../vinagre/vinagre-ui.h:61 +msgid "Remove current selected connection from bookmarks" +msgstr "" + +#: ../vinagre/vinagre-ui.h:62 +msgid "_New Folder" +msgstr "नवीन फ़ोल्डर (_N)" + +#: ../vinagre/vinagre-ui.h:63 +msgid "Create a new folder" +msgstr "नवीन फोल्डर बनाबू" + +#. Help menu +#: ../vinagre/vinagre-ui.h:66 +msgid "_Contents" +msgstr "विषय सूची (_C)" + +#: ../vinagre/vinagre-ui.h:67 +msgid "Open the vinagre manual" +msgstr "" + +#: ../vinagre/vinagre-ui.h:69 +msgid "About this application" +msgstr "एहि अनुप्रयोग क' बारेमे" + +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "अओजारपट्टी (_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "अओजारपट्टी नुकाबू अथवा देखाबू" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "स्थिति-पट्टी (_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "" + +#: ../vinagre/vinagre-ui.h:91 +msgid "Close the current connection" +msgstr "एहि कनेक्शनकेँ बन्न करू" + +#: ../vinagre/vinagre-ui.h:92 +msgid "C_lose All" +msgstr "" + +#: ../vinagre/vinagre-ui.h:93 +msgid "Close all active connections" +msgstr "" + +#. Bookmarks menu +#: ../vinagre/vinagre-ui.h:96 +msgid "_Add to bookmarks" +msgstr "" + +#: ../vinagre/vinagre-ui.h:97 +msgid "Add current connection to your bookmarks" +msgstr "" + +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "" + +#: ../vinagre/vinagre-ui.h:105 +msgid "Take a screenshot of active connection" +msgstr "" + +#: ../vinagre/vinagre-ui.h:109 +msgid "View the current machine in full screen" +msgstr "" + +#: ../vinagre/vinagre-utils.c:75 +msgid "An error has occurred:" +msgstr "" + +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "" + +#: ../vinagre/vinagre-utils.c:456 +msgid "" +"Vinagre 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 "" + +#: ../vinagre/vinagre-utils.c:460 +msgid "" +"Vinagre 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 "" + +#: ../vinagre/vinagre-utils.c:464 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"this program. If not, see ." +msgstr "" + +#: ../vinagre/vinagre-utils.c:486 +msgid "translator-credits" +msgstr "संगीता कुमारी (sangeeta09@gmail.com)" + +#: ../vinagre/vinagre-utils.c:489 +msgid "Vinagre Website" +msgstr "" + +#: ../vinagre/vinagre-window.c:397 +#, c-format +msgid "Could not merge vinagre-ui.xml: %s" +msgstr "" + +#: ../vinagre/vinagre-window.c:425 +msgid "_Recent connections" +msgstr "" + +#. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu +#: ../vinagre/vinagre-window.c:585 +#, c-format +msgid "Open %s:%d" +msgstr "" + diff -Nru vinagre-2.26.1/po/Makefile.in.in vinagre-2.29.1/po/Makefile.in.in --- vinagre-2.26.1/po/Makefile.in.in 2009-04-13 14:35:26.000000000 +0100 +++ vinagre-2.29.1/po/Makefile.in.in 2009-10-26 13:35:18.000000000 +0000 @@ -21,7 +21,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) @@ -129,7 +129,7 @@ done # Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: +dvi info ctags tags CTAGS TAGS ID: # Define this as empty until I found a useful application. install-exec installcheck: diff -Nru vinagre-2.26.1/po/ml.po vinagre-2.29.1/po/ml.po --- vinagre-2.26.1/po/ml.po 2009-03-17 00:19:13.000000000 +0000 +++ vinagre-2.29.1/po/ml.po 2009-09-17 15:20:20.000000000 +0100 @@ -1,3 +1,4 @@ +# translation of vinagre.master.ml.po to # Malayalam translation of vinagre # Copyright (C) 2008 vinagre'S COPYRIGHT HOLDER # This file is distributed under the same license as the vinagre package. @@ -8,12 +9,12 @@ # Harivishnu VN , 2009 msgid "" msgstr "" -"Project-Id-Version: vinagre.HEAD\n" +"Project-Id-Version: vinagre.master.ml\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-02-18 20:37+0000\n" -"PO-Revision-Date: 2009-03-16 01:25+0730\n" -"Last-Translator: Hari|ഹരി Vishnu | വിഷ്ണു \n" -"Language-Team: Malayalam \n" +"POT-Creation-Date: 2009-08-25 12:02+0000\n" +"PO-Revision-Date: 2009-09-12 00:18+0530\n" +"Last-Translator: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,174 +22,191 @@ "X-Poedit-Language: Malayalam\n" "X-Poedit-Country: INDIA\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Lokalize 0.2\n" +"X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_സംബന്ധിച്ചു്" -#: ../data/GNOME_VinagreApplet.xml.h:2 -#: ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "‌_സഹായം" -#: ../data/vinagre.desktop.in.in.h:1 -#: ../data/vinagre-file.desktop.in.in.h:1 +#: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 msgid "Access remote desktops" msgstr "വിദൂര പണിയിടത്തില്‍ പ്രവേശിയ്ക്കുക" -#: ../data/vinagre.desktop.in.in.h:2 -#: ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 -#: ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 -#: ../src/vinagre-main.c:151 +#: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "വിദൂര പണിയിട ദര്‍ശനി" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "തിരിച്ചറിയല്‍ ആവശ്യമാണു്‌" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "ബന്ധത്തിന്റെ ഐച്ഛികങ്ങള്‍" +#: ../data/vinagre.ui.h:1 +#| msgid "All fields above are mandatory" +msgid "All fields above are mandatory" +msgstr "മുകളിലുള്ള എല്ലാ സ്ഥാനങ്ങളും നിര്‍ബന്ധമാണു്" + +#: ../data/vinagre.ui.h:2 +#| msgid "Authentication is required" +msgid "Authentication is required" +msgstr "തിരിച്ചറിയല്‍ ആവശ്യമാണു്" -#: ../data/vinagre.glade.h:3 -#| msgid "Connection options" -msgid "Connection" -msgstr "ബന്ധം " +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 +msgid "Bookmarks" +msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ " -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "തട്ടം" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "വിനിമയതലം" +#: ../data/vinagre.ui.h:4 +#| msgid "Connecting..." +msgid "Connection" +msgstr "കണക്ഷന്‍" -#: ../data/vinagre.glade.h:6 +#: ../data/vinagre.ui.h:5 #| msgid "Connection options" -msgid "Options" -msgstr "ഐച്ഛികങ്ങള്‍" +msgid "Connection options" +msgstr "ബന്ധത്തിനുള്ള ഐച്ഛികങ്ങള്‍" -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "സംരക്ഷക (പേരെന്റ്) തട്ടം" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "മുകളിലുള്ള എല്ലാ സ്ഥാനങ്ങളും നിര്‍ബന്ധമാണു്‌" +#: ../data/vinagre.ui.h:6 +#| msgid "New Folder" +msgid "Folder" +msgstr "ഫോള്‍ഡര്‍" -#: ../data/vinagre.glade.h:10 -#: ../src/vinagre-fav.c:846 -msgid "Bookmarks" -msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ " - -#: ../data/vinagre.glade.h:11 -#: ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1066 +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "ഹോസ്റ്റ്:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +#| msgid "Interface" +msgid "Interface" +msgstr "വിനിമയതലം" + +#: ../data/vinagre.ui.h:9 +#| msgid "Options" +msgid "Options" +msgstr "ഐച്ഛികങ്ങള്‍" + +#: ../data/vinagre.ui.h:10 +#| msgid "Parent Folder" +msgid "Parent Folder" +msgstr "പേരന്റ് ഫോള്‍ഡര്‍" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "മുന്‍ഗണനകള്‍" -#: ../data/vinagre.glade.h:13 -#: ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "ഒരു സജീവമായ ബന്ധം മാത്രമേ ഉള്ളെങ്കിലും നമ്മള്‍ പുതിയ കിളിവാതിലുകള്‍ കാണിയ്ക്കണോ എന്നു്" +#: ../data/vinagre.ui.h:12 +#| msgid "Which machine do you want to connect to?" +msgid "Which machine do you want to connect to?" +msgstr "നിങ്ങള്‍ക്കു് ഏതു് മഷീനിലേക്ക് കണക്ട് ചെയ്യണം?" -#: ../data/vinagre.glade.h:14 -#: ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "വിഭവസൂചിക ആക്സെലറേറ്ററുകള്‍ (ചുരുക്ക-കീകള്‍) കാണിക്കണോ എന്നു്" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "(_A)എല്ലാപ്പോഴും ടാബുകള്‍ കാണിക്കുക" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "(_A)തിരിച്ചറിയല്‍ നടത്തുക" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_മുഴുവന്‍ സ്ക്രീന്‍" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_ഹോസ്റ്റ്:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "‌_പേരു്:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_അടയാളവാക്കു്:" -#: ../data/vinagre.glade.h:22 -#| msgid "_Remember this password" +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_സമ്പ്രദായം:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "(_R)ഈ അടയാളവാക്കു് ഓര്‍ത്തുവെയ്ക്കുക" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_വലിപ്പം മാറ്റല്‍" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "(_S)വിഭവസൂചിക ചുരുക്കവഴികള്‍ കാണിക്കുക" -#: ../data/vinagre.glade.h:25 -#| msgid "_Name:" +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "‌(_U)ഉപയുക്താവ്പേരു്:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "‌_കാണുവാന്‍ മാത്രം" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "സജീവമായ പ്ലഗിനുകള്‍" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "ഹോസ്റ്റ് അല്ലെങ്കില്‍ ഹോസ്റ്റ്:കാഴ്ച (host:display) അല്ലെങ്കില്‍ ഹോസ്റ്റ്::പോര്‍ട്ട് (host::port)" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"സജീവമായ പ്ലഗിനുകള്‍. ഇതില്‍ സജീവ പ്ലഗിനുകളുടെ \"സ്ഥാനം\" ലഭിക്കുന്നു. " +"ഒരു പ്ലഗിന്റെ \"സ്ഥാനം\" കാണുന്നതിനായി .vinagre-plugin ഫയല്‍ കാണുക." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "ബന്ധപെടുന്നതിനുള്ള സംഭാഷണത്തില്‍ ഉണ്ടാകാവുന്ന ഏറ്റവും കൂടിയ ചരിത്ര ഇനങ്ങളുടെ എണ്ണം" -#: ../data/vinagre.schemas.in.h:2 -msgid "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. Note that if they are enabled, those keys will be intercepted by the menu and will not be sent to the remote host." -msgstr "വിഭവസൂചികയുടെ ചുരുക്കകീകള്‍ പ്രാവര്‍ത്തികമല്ലാതാക്കാന്‍ \"false\"(\"വേണ്ട\") ആക്കുക. അവ പ്രാവര്‍ത്തികമാക്കാന്‍ \"true\"(\"ശരി\"). ഇവ പ്രാവര്‍ത്തികമാക്കിയാല്‍, വിദൂര ഹോസ്റ്റിനു് അയയ്ക്കുന്നതിനു് പകരം ഈ കീകള്‍ വിഭവസൂചികയ്ക്കാണു് ലഭിക്കുക എന്നു് പ്രത്യേകം ശ്രദ്ധിക്കുക." - -#: ../data/vinagre.schemas.in.h:3 -msgid "Set to \"true\" to always show the tabs. Set to \"false\" to only show the tabs when there is more than one active connection." -msgstr "എപ്പോളും കിളിവാതിലുകള്‍ കാണിയ്ക്കാന്‍ \"true\"(\"ശരി\"). ഒന്നിലേറെ സജീവമായ ബന്ധങ്ങളുള്ളപ്പോള്‍ മാത്രം കിളിവാതിലുകള്‍ കാണിയ്ക്കാന്‍ \"false\"(\"വേണ്ട\") ആക്കുക." +#: ../data/vinagre.schemas.in.in.h:4 +msgid "" +"Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " +"Note that if they are enabled, those keys will be intercepted by the menu " +"and will not be sent to the remote host." +msgstr "" +"വിഭവസൂചികയുടെ ചുരുക്കകീകള്‍ പ്രാവര്‍ത്തികമല്ലാതാക്കാന്‍ \"false\"(\"വേണ്ട\") ആക്കുക. അവ " +"പ്രാവര്‍ത്തികമാക്കാന്‍ \"true\"(\"ശരി\"). ഇവ പ്രാവര്‍ത്തികമാക്കിയാല്‍, വിദൂര ഹോസ്റ്റിനു് " +"അയയ്ക്കുന്നതിനു് പകരം ഈ കീകള്‍ വിഭവസൂചികയ്ക്കാണു് ലഭിക്കുക എന്നു് പ്രത്യേകം ശ്രദ്ധിക്കുക." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:5 +msgid "" +"Set to \"true\" to always show the tabs. Set to \"false\" to only show the " +"tabs when there is more than one active connection." +msgstr "" +"എപ്പോളും കിളിവാതിലുകള്‍ കാണിയ്ക്കാന്‍ \"true\"(\"ശരി\"). ഒന്നിലേറെ സജീവമായ " +"ബന്ധങ്ങളുള്ളപ്പോള്‍ മാത്രം കിളിവാതിലുകള്‍ കാണിയ്ക്കാന്‍ \"false\"(\"വേണ്ട\") ആക്കുക." + +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "ഹോസ്റ്റുകളുടെ പട്ടികയില്‍ കാണിക്കേണ്ട ഇനങ്ങളുടെ ഏറ്റവും കൂടിയ എണ്ണം വ്യക്തമാക്കുന്നു." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" യുആര്‍എല്ലുകളെ കൈകാര്യം ചെയ്യുന്നതു്." -#: ../data/vinagre.schemas.in.h:6 -msgid "When connecting to a host, the client can say to the server to leave other clients connected or to drop the existent connections. Set the value to true to share the desktop with the other clients." -msgstr "ഒരു ഹോസ്റ്റിലേയ്ക്കു് ബന്ധപ്പെടുമ്പോള്‍, ക്ലയന്റിന് സെര്‍വറിനോട് മറ്റുള്ള ക്ലയന്റുകളെ വിടാനോ നിലവിലുള്ള ബന്ധങ്ങള്‍ കളയാനോ പറയാം. പണിയിടം മറ്റു ക്ലയന്റുകളുമായി പങ്കുവെക്കാന്‍ മൂല്യം 'ശരി' (ട്രൂ) എന്നാക്കുക." +#: ../data/vinagre.schemas.in.in.h:8 +msgid "" +"When connecting to a host, the client can say to the server to leave other " +"clients connected or to drop the existent connections. Set the value to true " +"to share the desktop with the other clients." +msgstr "" +"ഒരു ഹോസ്റ്റിലേയ്ക്കു് ബന്ധപ്പെടുമ്പോള്‍, ക്ലയന്റിന് സെര്‍വറിനോട് മറ്റുള്ള ക്ലയന്റുകളെ വിടാനോ നിലവിലുള്ള " +"ബന്ധങ്ങള്‍ കളയാനോ പറയാം. പണിയിടം മറ്റു ക്ലയന്റുകളുമായി പങ്കുവെക്കാന്‍ മൂല്യം 'ശരി' (ട്രൂ) " +"എന്നാക്കുക." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "മറ്റു ക്ലയന്റുകളെ ബന്ധപ്പെട്ട നിലയില്‍ വിടണമോ എന്നു്" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "ഒരു സജീവമായ ബന്ധം മാത്രമേ ഉള്ളെങ്കിലും നമ്മള്‍ പുതിയ കിളിവാതിലുകള്‍ കാണിയ്ക്കണോ എന്നു്" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "വിഭവസൂചിക ആക്സെലറേറ്ററുകള്‍ (ചുരുക്ക-കീകള്‍) കാണിക്കണോ എന്നു്" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "വിദൂര പണിയിട (വിഎന്‍സി) ഫയല്‍" @@ -197,632 +215,820 @@ msgid "Remote Desktop Connection" msgstr "വിദൂര പണിയിട ബന്ധം" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "യുണിക്സ്/ലിനക്സ് ടെര്‍മിനലുകളിലേക്ക് പ്രവേശിക്കുക" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "പോര്‍ട്ട്:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH പിന്തുണ" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"'പങ്കു വെച്ച' (ഷേഡ്) ഫ്ലാഗിനു തെറ്റായ വില : %d. അതു്‌ 0 അല്ലെങ്കില്‍ 1 ആകേണ്ടതാണു്‌. അതിനെ " +"അവഗണിക്കുന്നു." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "സ്കെയില്‍ഡ് മോഡ് പ്രവര്‍ത്തന സജ്ജമാക്കുക" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "വിഎന്‍സി ഐച്ഛികങ്ങള്‍:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "വിഎന്‍സി ഐച്ഛികങ്ങള്‍ കാണിക്കുക" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "വിഎന്‍സി" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "യുണിക്സ്/ലിനക്സ്, വിന്‍ഡോസ്, മറ്റെല്ലാ മെഷീനുകളിലേക്കും പ്രവേശിക്കുക." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "ഫയലിലൂടെ തിരയാനായില്ല" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "ഫയല്‍ വിഎന്‍സിയല്ല: \"കണക്ഷന്‍\" ഗ്രൂപ്പ് ലഭ്യമല്ല." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "ഫയല്‍ വിഎന്‍സിയല്ല: \"ഹോസ്റ്റ്\" ഗ്രൂപ്പ് ലഭ്യമല്ല." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "വിഎന്‍സി ഐച്ഛികങ്ങള്‍" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "‌_കാണുവാന്‍ മാത്രം" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_വലിപ്പം മാറ്റല്‍" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "വിഎന്‍സി ഫയലുകള്‍" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "പണിയിടത്തിന്റെ പേരു്:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "അളവ് :" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "ഹോസ്റ്റുമായി ബന്ധിപ്പിയ്ക്കുന്നതില്‍ തെറ്റു്." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +#| msgid "Authentication method to host %s is unsupported. (%u)" +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "%s എന്ന ഹോസ്റ്റിലേക്കുള്ള തിരിച്ചറിയല്‍ പ്രക്രിയ പിന്തുണക്കുന്നതല്ല. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr " തിരിച്ചറിയല്‍ പ്രക്രിയ പിന്തുണക്കുന്നതല്ല." + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "തിരിച്ചറിയലില്‍ തെറ്റ്" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "ഈ യന്ത്രം ഉപയോഗിക്കാന്‍ ഒരു ഉപയുക്താവ് പേരു്‌ ആവശ്യമാണു്‌" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "ഈ യന്ത്രം ഉപയോഗിക്കാന്‍ ഒരു പാസ്വേഡ് ആവശ്യമാണു്‌" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "_വലിപ്പം മാറ്റല്‍" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +#| msgid "Fit the remote screen into the current window size" +msgid "Fits the remote screen into the current window size" +msgstr "റിമോട്ട് സ്ക്രീന്‍ നിലവിലുള്ള ജാലക വലിപ്പത്തിലേക്ക് ആക്കുന്നു" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +#| msgid "Disable mouse and keyboard" +msgid "Does not send mouse and keyboard events" +msgstr "മൌസും കീബോര്‍ഡും ഈവന്റുകളും അയയ്ക്കുന്നില്ല" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "(_O)നേരായ വലിപ്പം" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "ജാലകം വിദൂര പണിയിടത്തിന്റെ വലിപ്പത്തിലേക്ക് മാറ്റുന്നു." + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del(കണ്ട്രോള്‍-ഓള്‍ട്-ഡെല്‍) അയയ്ക്കുക " + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +#| msgid "Send Ctrl+Alt+Del to active connection" +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Ctrl+Alt+Del വിദൂര സിസ്റ്റത്തിലേക്ക് അയയ്ക്കുന്നു" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "വലിപ്പം മാറ്റല്‍" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "തുറക്കാന്‍ മാത്രം (റീഡ് ഒണ്‍ളി)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"വലിപ്പം മാറ്റല്‍ ഈ ഇന്‍സ്റ്റൊളേഷനില്‍ പിന്തുണ നല്‍കുന്നില്ല..\n" +"\n" +"റീഡ്-മീ (എന്നെ വായിക്കുക) ഫയല്‍ വായിക്കുക (ഇത് വിനാഗ്രെയുടെ കൂടെ ലഭിക്കുന്നു) ഈ ഗുണം എങ്ങനെ " +"പ്രാവര്‍ത്തികമാക്കണമെന്ന് അറിയാന്‍" + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "വിഎന്‍സി പിന്തുണ" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "വിദൂര മഷീനുകളെ പെട്ടെന്നു് സമീപിയ്ക്കുവാനുള്ള ഒരു വിഭവസൂചിക" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "വിനാഗ്രെ ലഘുപ്രയോഗ ഫാക്റ്ററി" -#: ../src/vinagre-applet.c:271 -#: ../src/vinagre-applet.c:349 -#| msgid "Could not run vinagre: %s" +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "വിനാഗ്രെ പ്രവര്‍ത്തിക്കാന്‍ സാധിച്ചില്ല :" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "വിദൂര പണിയിട ദര്‍ശിനി തുറക്കുക" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ ഉപയോഗിക്കുക" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "%s എന്ന കീഴ്‌വഴക്കം പിന്തുണയുള്ളതല്ല." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ തുടക്കങ്ങുന്നതില്‍ തെറ്റു്:%s" -#: ../src/vinagre-bookmarks.c:344 -#: ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:275 -#: ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 -#: ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "അറിയപ്പെടാത്ത തെറ്റു്" -#: ../src/vinagre-bookmarks.c:351 -#| msgid "Error while initializing bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ തുടങ്ങുന്നതില്‍ തെറ്റു്:ഫയലില്‍ ഒന്നും ഇല്ലായിരിക്കാം" -#: ../src/vinagre-bookmarks.c:358 -#| msgid "Error while initializing bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ തുടങ്ങുന്നതില്‍ തെറ്റു്:ഈ ഫയല്‍ ഒരു വിനാഗ്രെ ഓര്‍മ്മക്കുറിപ്പ് ഫയലല്ല." -#: ../src/vinagre-bookmarks.c:420 -#: ../src/vinagre-bookmarks.c:427 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ സംഭരിയ്ക്കുമ്പോള്‍ തെറ്റു്: XML ഘടന ഉണ്ടാക്കാന്‍ കഴിഞ്ഞില്ല" -#: ../src/vinagre-bookmarks.c:434 -#: ../src/vinagre-bookmarks.c:441 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ സംഭരിയ്ക്കുമ്പോള്‍ തെറ്റു്: XML ഘടന തുടങ്ങാന്‍ കഴിഞ്ഞില്ല" -#: ../src/vinagre-bookmarks.c:450 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ സംഭരിയ്ക്കുമ്പോള്‍ തെറ്റു്: XML ഘടന ഉറപ്പാക്കാന്‍ കഴിഞ്ഞില്ല" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ സംഭരിയ്ക്കുമ്പോള്‍ തെറ്റു്: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ പുതിയ സ്ഥാനത്തേക്കു പകര്‍ത്തുംബോള്‍ തെറ്റു്: XML ഘടന ഉണ്ടാക്കാന്‍ കഴിഞ്ഞില്ല" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ പുതിയ സ്ഥാനത്തേക്കു പകര്‍ത്തുംബോള്‍ തെറ്റു്: XML ഘടന തുടങ്ങാന്‍ കഴിഞ്ഞില്ല" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ പുതിയ സ്ഥാനത്തേക്കു പകര്‍ത്തുംബോള്‍ തെറ്റു്: XML ഘടന ഉറപ്പാക്കാന്‍ കഴിഞ്ഞില്ല" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format -#| msgid "Error while saving bookmarks: %s" msgid "Error while migrating bookmarks: %s" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ പുതിയ സ്ഥാനത്തേക്ക് പകര്‍ത്തുംബോള്‍ തെറ്റു്: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +#| msgid "Error while migrating bookmarks: %s" +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ പുതിയ സ്ഥാനത്തേക്ക് മാറ്റുമ്പോള്‍ തെറ്റു്: വിഎന്‍സി പ്ലഗിന്‍ സജീവമല്ല." + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "തട്ടം ഉണ്ടാക്കാന്‍ കഴിഞ്ഞില്ല" -#: ../src/vinagre-bookmarks-migration.c:255 -#| msgid "" -#| "Copying the bookmarks file to the new location. This operation is only " -#| "supposed to run once." -msgid "Migrating the bookmarks file to the new format. This operation is only supposed to run once." -msgstr "ഓര്‍മ്മക്കുറിപ്പുകളുടെ ഫയല്‍ ഒരു പുതിയ ഫോര്‍മാറ്റിലേക്ക് പകര്‍ത്തുന്നു. ഈ നടപടി ഒരിക്കല്‍ മാത്രമെ പ്രവര്‍ത്തിക്കാന്‍ പാടുള്ളു." +#: ../vinagre/vinagre-bookmarks-migration.c:262 +msgid "" +"Migrating the bookmarks file to the new format. This operation is only " +"supposed to run once." +msgstr "" +"ഓര്‍മ്മക്കുറിപ്പുകളുടെ ഫയല്‍ ഒരു പുതിയ ഫോര്‍മാറ്റിലേക്ക് പകര്‍ത്തുന്നു. ഈ നടപടി ഒരിക്കല്‍ മാത്രമെ " +"പ്രവര്‍ത്തിക്കാന്‍ പാടുള്ളു." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format -#| msgid "Error while saving bookmarks: %s" msgid "Error opening old bookmarks file: %s" msgstr "പഴയ ഓര്‍മ്മക്കുറിപ്പുകളുടെ ഫയല്‍ തുറക്കുംമ്പോള്‍ തെറ്റു്: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "പുതിയ സ്ഥാനത്തേക്കുള്ള മാറ്റം റദ്ദാക്കി" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "പഴയ ഓര്‍മ്മക്കുറിപ്പ് ഫയല്‍ നീക്കം ചെയ്യാന്‍ കഴിഞ്ഞില്ല" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "മൂല തട്ടം" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "തട്ടത്തിനു്‌ അസാധുവായ പേരു്‌" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "ഈ ഫോള്‍ഡറില്‍ \"%s\" എന്നു് പേരു് നിലവിലുപയോഗത്തിലുണ്ടു്. ദയവായി മറ്റൊരു പേരുപയോഗിക്കുക." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +#| msgid "Invalid name for this folder" +msgid "Invalid name for this item" +msgstr "ഈ‌ വസ്തുവിനു് തെറ്റായ പേരു്" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "%sനെ ഓര്‍മ്മക്കുറിപ്പുകളില്‍ നിന്നു് മാറ്റണമെന്നുള്ളതു് താങ്കള്‍ക്കുറപ്പാണോ?" +msgid "(Protocol: %s)" +msgstr "(സമ്പ്രദായം: %s)" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +#| msgid "Are you sure you want to remove %s from bookmarks?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "%s-നെ ഓര്‍മ്മക്കുറിപ്പുകളില്‍ നിന്നും മാറ്റണമെന്നു് താങ്കള്‍ക്കുറപ്പാണോ?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "തട്ടം നീക്കം ചെയ്യട്ടേ ?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "ശ്രദ്ധിക്കുക : ഇതിന്റെ കീഴിലുള്ള തട്ടങ്ങളും ഇനങ്ങളും കൂടെ നീക്കം ചെയ്യപെടും." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "ഇനം നീക്കം ചെയ്യട്ടേ ?" -#: ../src/vinagre-bookmarks-ui.c:264 -#| msgid "Error while saving bookmarks: %s" +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "ഓര്‍മ്മക്കുറിപ്പ് നീക്കം ചെയ്യുംബോള്‍ തെറ്റ് : എന്‍ട്രി കണ്ടെത്താനായില്ല" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "പുതിയ തട്ടം" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "ഫയല്‍ തെരഞ്ഞെടുക്കുക" -#: ../src/vinagre-commands.c:124 -#: ../src/vinagre-tab.c:1156 -msgid "Supported formats" -msgstr "പിന്തുണയ്ക്കുന്ന ഫോര്‍മാറ്റുകള്‍" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "പിന്തുണയുള്ള ഫയലുകള്‍ ലഭ്യമല്ല" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"സജീവമായിട്ടുള്ള ഒരു പ്ലഗിനും പിന്തുണയുള്ള ഫയല്‍ തുറക്കുവാന്‍ അനുവദിക്കുന്നില്ല. " +"വേറെ പ്ലഗിനുകള്‍ സജീവമാക്കി വീണ്ടും ശ്രമിക്കുക." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "താഴെ പറയുന്ന ഫയല്‍ തുറക്കാന്‍ സാധിക്കില്ല :" msgstr[1] "താഴെ പറയുന്ന ഫയലുകള്‍ തുറക്കാന്‍ സാധിക്കില്ല:" -#: ../src/vinagre-connect.c:179 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "സമ്പ്രദായങ്ങളുടെ പട്ടികയിലുള്ള സജീവമായ സമ്പ്രദായം ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "ചരിത്ര ഫയല്‍ സൂക്ഷിക്കുമ്പോള്‍ തെറ്റു്: %s" -#: ../src/vinagre-connect.c:191 -msgid "Choose a VNC Server" -msgstr "ഒരു വിഎന്‍സി സെര്‍വര്‍ തെരഞ്ഞെടുക്കുക" +#: ../vinagre/vinagre-connect.c:340 +#| msgid "Open Remote Desktop Viewer" +msgid "Choose a Remote Desktop" +msgstr "വിദൂര പണിയിടം തെരഞ്ഞെടുക്കുക" -#: ../src/vinagre-connection.c:600 -#, c-format -msgid "The protocol %s is not supported." -msgstr "%s എന്ന കീഴ്‌വഴക്കം പിന്തുണയുള്ളതല്ല." - -#: ../src/vinagre-connection.c:695 -#| msgid "Choose the file" +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "ഫയല്‍ തുറക്കാനായില്ല" -#: ../src/vinagre-connection.c:714 -#| msgid "Choose the file" -msgid "Could not parse the file." -msgstr "ഫയലിലൂടെ തിരയാനായില്ല" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "ഒരു പ്ലഗിനുകളും ഫയല്‍ തിരിച്ചറിഞ്ഞില്ല." -#: ../src/vinagre-connection.c:759 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "'പങ്കു വെച്ച' (ഷേഡ്) ഫ്ലാഗിനു തെറ്റായ വില : %d. അതു്‌ 0 അല്ലെങ്കില്‍ 1 ആകേണ്ടതാണു്‌. അതിനെ അവഗണിക്കുന്നു." - -#: ../src/vinagre-connection.c:765 -msgid "Could not find the host address in the file." -msgstr "ആതിഥേയന്‍റ്റെ മേലവിലാസം ഫയലില്‍ കണ്ടെത്താനായില്ല." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "അസാധുവായ പ്രവ്രത്തി" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "നീക്കി വലിച്ചിടല്‍ (drag&drop) പ്രവൃത്തിയില്‍ നിന്നും ലഭിച്ച വിവരം അസാധുവാണു്‌." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "അടുത്തുള്ള ഹോസ്റ്റുകള്‍" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "ഒരു .വിഎന്‍സി ഫയല്‍ തുറക്കുക" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "ഫയലിന്റെ പേരു്" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "വിനാഗ്രേ സ്ക്രീന്‍പൂര്‍ണ്ണവലിപ്പത്തില്‍ എന്ന മോഡില്‍ തുറക്കുക" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "വിനാഗ്രെയുടെ നേരത്തെ ഉള്ള ഇന്‍സ്റ്റെന്‍സില്‍ ഒരു പുതിയ മുകള്‍-നില ജാലകം ഉണ്ടാക്കുക." -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "വിനാഗ്രെ തിരിച്ചറിയുന്ന ഒരു ഫയല്‍ തുറക്കുക" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "ഫയലിന്റെ പേരു്" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[സെര്‍വര്‍:പോര്‍ട്ട്]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "താഴെ പറയുന്ന തെറ്റു് പറ്റിയിട്ടുണ്ടു്:" msgstr[1] "താഴെ പറയുന്ന തെറ്റുകള്‍ പറ്റിയിട്ടുണ്ടു്:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "_ഗ്നോമിനായുള്ള വിഎന്‍സി ക്ലയന്റ്" +#: ../vinagre/vinagre-main.c:169 +#| msgid "Remote Desktop Viewer" +msgid "- Remote Desktop Viewer" +msgstr "- വിദൂര പണിയിട ദര്‍ശനി" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" -msgstr "'vinagre --help' എന്ന ആജ്ഞ പ്രവര്‍ത്തിപ്പിച്ചാല്‍ ലഭ്യമായ ആജ്ഞയോടൊപ്പം കൊടുക്കാവുന്ന എല്ലാ ഐച്ഛികങ്ങളുടേയും പട്ടിക കാണാവുന്നതാണു്" +msgstr "" +"'vinagre --help' എന്ന ആജ്ഞ പ്രവര്‍ത്തിപ്പിച്ചാല്‍ ലഭ്യമായ ആജ്ഞയോടൊപ്പം കൊടുക്കാവുന്ന എല്ലാ " +"ഐച്ഛികങ്ങളുടേയും പട്ടിക കാണാവുന്നതാണു്" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "അവാഹി ഹോസ്റ്റിന്റെ പേര് റിസോള്‍വ് ചെയ്യാന്‍ സാധിച്ചില്ല: %s\n" -#: ../src/vinagre-mdns.c:175 -#: ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "പ്ലഗിന്‍ %s നിലവില്‍ %s സേവനത്തിനായി ഒരു ബ്രൌസര്‍ രജിസ്ടര്‍ ചെയ്തിരിക്കുന്നു." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to add mDNS browser for service %s." +msgstr "%s സേവനത്തിനായി mDNS ബ്രൌസര്‍ ചേര്‍ക്കുന്നതില്‍ പരാജയപ്പെട്ടു." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "ഹോസ്റ്റുകള്‍ക്കായി തിരയുവാന്‍ സാധിച്ചില്ല: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS ബ്രൌസര്‍ ആരംഭിക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -#| msgid "Connection to host \"%s\" was closed." -msgid "Connection to host %s was closed." -msgstr "%s എന്ന ഹോസ്റ്റുമായുള്ള ബന്ധം അടച്ചു." +#| msgid "Connection to host %s was closed." +msgid "Connection to host %s was closed." +msgstr "%s എന്ന ഹോസ്റ്റുമായുള്ള ബന്ധം അടച്ചു." -#: ../src/vinagre-notebook.c:170 -#| msgid "Connection to host \"%s\" was closed." +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "ബന്ധം അടച്ചു." -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +#| msgid "Authentication to host %s has failed" +msgid "Authentication to host %s has failed" +msgstr "%s എന്ന ഹോസ്റ്റിലേക്കുള്ള തിരിച്ചറിയല്‍ പ്രക്രിയ പരാജയപ്പെട്ടു" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr " തിരിച്ചറിയല്‍ പ്രക്രിയ പരാജയപ്പെട്ടു" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "ബന്ധിപ്പിയ്ക്കുന്നു...." -#: ../src/vinagre-notebook.c:221 -#: ../src/vinagre-tab.c:882 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "ബന്ധം അടയ്ക്കുന്നു" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "പ്ലഗിന്‍ മാനേജര്‍" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "പ്ലഗിന്‍" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "പ്രവര്‍ത്തന സജ്ജം" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "ക്ര_മീകരിക്കുക" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "സ_ജീവമാക്കുക" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "എല്ലാം സജീ_വമാക്കുക" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "എല്ലാം _നിര്‍ജ്ജീവമാക്കുക" + +#: ../vinagre/vinagre-plugin-manager.c:824 +#| msgid "_About" +msgid "_About Plugin" +msgstr "പ്ലഗിന്‍ _സംബന്ധിച്ചു്" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "പ്ലഗിന്‍ _ക്രമീകരിക്കുക" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "മുന്‍ഗണനാ നടത്തിപ്പുകാരന്‍ തുടങ്ങാന്‍ സാധിയ്ക്കുന്നില്ല." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "ഹോസ്റ്റുമായി ബന്ധിപ്പിയ്ക്കുന്നതില്‍ തെറ്റു്." - -#: ../src/vinagre-tab.c:354 -#, c-format -#| msgid "Authentication to host \"%s\" has failed" -msgid "Authentication to host %s has failed" -msgstr "%s എന്ന ഹോസ്റ്റിലേക്കുള്ള തിരിച്ചറിയല്‍ പ്രക്രിയ പരാജയപ്പെട്ടു" - -#: ../src/vinagre-tab.c:360 -#| msgid "Authentication to host \"%s\" has failed" -msgid "Authentication failed" -msgstr " തിരിച്ചറിയല്‍ പ്രക്രിയ പരാജയപ്പെട്ടു" +#: ../vinagre/vinagre-tab.c:346 +#| msgid "_Full screen" +msgid "Leave fullscreen" +msgstr "പൂര്‍ണ്ണവലിപ്പത്തില്‍ നിന്നും പുറത്തുകടക്കുക" -#: ../src/vinagre-tab.c:382 -#, c-format -#| msgid "Authentication method to host \"%s\" is unsupported. (%u)" -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "%s എന്ന ഹോസ്റ്റിലേക്കുള്ള തിരിച്ചറിയല്‍ പ്രക്രിയ പിന്തുണക്കുന്നതല്ല. (%u)" - -#: ../src/vinagre-tab.c:386 -#| msgid "Authentication method to host \"%s\" is unsupported. (%u)" -msgid "Authentication unsupported" -msgstr " തിരിച്ചറിയല്‍ പ്രക്രിയ പിന്തുണക്കുന്നതല്ല." - -#: ../src/vinagre-tab.c:464 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "അടുത്തിടെയുണ്ടായ ബന്ധം സൂക്ഷിയ്ക്കുന്നതില്‍ തെറ്റു്." -#: ../src/vinagre-tab.c:496 -#| msgid "Error saving the password on the keyring." -msgid "Error saving the credential on the keyring." -msgstr "ചാവിക്കൂട്ടത്തില്‍ ചാവി സംഭരിക്കുന്നതില്‍ തെറ്റു്." - -#: ../src/vinagre-tab.c:751 -#: ../src/vinagre-tab.c:768 -msgid "Authentication error" -msgstr "തിരിച്ചറിയലില്‍ തെറ്റ്" - -#: ../src/vinagre-tab.c:752 -msgid "A username is required in order to access this machine." -msgstr "ഈ യന്ത്രം ഉപയോഗിക്കാന്‍ ഒരു ഉപയുക്താവ് പേരു്‌ ആവശ്യമാണു്‌" - -#: ../src/vinagre-tab.c:769 -msgid "A password is required in order to access this machine." -msgstr "ഈ യന്ത്രം ഉപയോഗിക്കാന്‍ ഒരു പാസ്വേഡ് ആവശ്യമാണു്‌" - -#: ../src/vinagre-tab.c:895 -msgid "Minimize window" -msgstr "ജാലകം മിനിമൈസ് ചെയ്യുക" +#: ../vinagre/vinagre-tab.c:728 +#| msgid "Error saving the credential on the keyring." +msgid "Error saving the credentials on the keyring." +msgstr "ചാവിക്കൂട്ടത്തില്‍ ആനുകൂല്യങ്ങള്‍ സംഭരിക്കുന്നതില്‍ തെറ്റു്." -#: ../src/vinagre-tab.c:910 -#: ../src/vinagre-tab.c:911 -msgid "Scaling" -msgstr "വലിപ്പം മാറ്റല്‍" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "ബന്ധത്തിന്റെ സ്ക്രീന്‍ഷോട്ട് എടുക്കാന്‍ കഴിഞ്ഞില്ല." -#: ../src/vinagre-tab.c:920 -#: ../src/vinagre-tab.c:921 -msgid "Read only" -msgstr "തുറക്കാന്‍ മാത്രം (റീഡ് ഒണ്‍ളി)" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "സ്ക്രീന്‍ഷോട്ട് സൂക്ഷിയ്ക്കുക" -#. Machine menu -#: ../src/vinagre-tab.c:931 -#: ../src/vinagre-tab.c:932 -#: ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "സ്ക്രീന്‍ഷോട്ട് എടുക്കുക" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s-ന്റെ സ്ക്രീന്‍ഷോട്ട്" -#: ../src/vinagre-tab.c:940 -#: ../src/vinagre-tab.c:941 -#: ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del(കണ്ട്രോള്‍-ഓള്‍ട്-ഡെല്‍) അയയ്ക്കുക " +#: ../vinagre/vinagre-tab.c:881 +#| msgid "Error saving recent connection." +msgid "Error saving screenshot" +msgstr "സ്ക്രീന്‍ഷോട്ട് സൂക്ഷിയ്ക്കുന്നതില്‍ തെറ്റു്" -#: ../src/vinagre-tab.c:1065 -msgid "Desktop Name:" -msgstr "പണിയിടത്തിന്റെ പേരു്:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "സര്‍വീസ് വിശേഷത ലഭിക്കുവാന്‍ സാധ്യമല്ല: %s" -#: ../src/vinagre-tab.c:1067 -msgid "Port:" -msgstr "പോര്‍ട്ട്:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +#| msgid "Failed to create the directory" +msgid "Impossible to create the connection: %s" +msgstr "കണക്ഷന്‍ ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല: %s" -#: ../src/vinagre-tab.c:1068 -msgid "Dimensions:" -msgstr "അളവ് :" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "സ്ട്രീം ട്യൂബ് സ്വീകരിക്കുവാന്‍ സാധ്യമല്ല: %s" -#: ../src/vinagre-tab.c:1134 -#| msgid "Take a screenshot of active connection" -msgid "Could not get a screenshot of the connection." -msgstr "ബന്ധത്തിന്റെ സ്ക്രീന്‍ഷോട്ട് എടുക്കാന്‍ കഴിഞ്ഞില്ല." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "ബന്ധപ്പടേണ്ട പേരു് ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല: %s" -#: ../src/vinagre-tab.c:1142 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s-ന്റെ സ്ക്രീന്‍ഷോട്ട്" +msgid "Impossible to get the avatar: %s" +msgstr "avatar ലഭ്യമാകുവാന്‍ സാധ്യമല്ല: %s" -#: ../src/vinagre-tab.c:1145 -msgid "Save Screenshot" -msgstr "സ്ക്രീന്‍ഷോട്ട് സൂക്ഷിയ്ക്കുക" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s-നു് നിങ്ങളുമായി പണിയിടം പങ്കിടണം." -#: ../src/vinagre-tab.c:1209 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable this feature." -msgstr "" -"വലിപ്പം മാറ്റല്‍ ഈ ഇന്‍സ്റ്റൊളേഷനില്‍ പിന്തുണ നല്‍കുന്നില്ല..\n" -"\n" -"റീഡ്-മീ (എന്നെ വായിക്കുക) ഫയല്‍ വായിക്കുക (ഇത് വിനാഗ്രെയുടെ കൂടെ ലഭിക്കുന്നു) ഈ ഗുണം എങ്ങനെ പ്രാവര്‍ത്തികമാക്കണമെന്ന് അറിയാന്‍" +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "പണിയിടം പങ്കിടുന്നതിനുള്ള ക്ഷണം" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_മഷീന്‍" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "‌‌_ചിട്ട" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "‌_കാഴ്ച" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_ഓര്‍മ്മക്കുറിപ്പുകള്‍" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "ഒരു വിദൂര മഷീനുമായി ബന്ധിപ്പിക്കുക" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "ഒരു .വിഎന്‍സി ഫയല്‍ തുറക്കുക" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "ഈ പ്രോഗ്രാമില്‍നിന്നു് പുറത്തുകടക്കുക" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "പ്രയോഗത്തിന്റെ മുന്‍ഗണനകള്‍ മാറ്റുക" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "ഓര്‍മ്മക്കുറിപ്പു് _തുറക്കുക" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "ഈ മഷീനിലേക്ക് ഘടിപ്പിക്കുക" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ _അടുക്കി വയ്ക്കുക." -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "തരഞ്ഞെടുത്ത ഓര്‍മ്മക്കുറിപ്പുകളുടെ വിവ‌രങ്ങള്‍ മാറ്റുക." -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_ഓര്‍മ്മക്കുറിപ്പുകളില്‍ നിന്നു് മാറ്റുക." -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "ഇപ്പോള്‍ തിരഞെടുത്തിരിക്കുന്ന ബന്ധം ഓര്‍മ്മക്കുറിപ്പുകളില്‍ നിന്നു് മാറ്റുക" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "(_N)പുതിയ തട്ടം" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "പുതിയ തട്ടം ഉണ്ടാക്കുക" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "‌_ഉള്ളടക്കം" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "വിനാഗ്രെയുടെ മാനുവല്‍ തുറക്കുക" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "ഈ പ്രയോഗത്തിനെ കുറിച്ചു്" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_ഉപകരണപ്പട്ട" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "ഉപകരണപ്പട്ട കാണിയ്ക്കുകയോ മറയ്ക്കുകയോ ചെയ്യുക" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_‌സ്ഥിതിവിവരപ്പട്ട" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "സ്ഥിതിവിവരപ്പട്ട കാണിയ്ക്കുകയോ മറയ്ക്കുകയോ ചെയ്യുക" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "വശത്തുള്ള _പാളി" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "വശത്തുള്ള പാളി കാണിയ്ക്കുകയോ മറയ്ക്കുകയോ ചെയ്യുക" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "ഇപ്പോഴത്തെ ബന്ധം അടക്കുക " -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "എല്ലാം _അടയ്ക്കുക " -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "സജീവമായ എല്ലാ സമ്പര്‍ക്കങ്ങളും അവസാനിപ്പിയ്ക്കുക." #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "ഓര്‍മ്മക്കുറിപ്പിലേയ്ക്കു് _ചേര്‍ക്കുക" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "ഇപ്പോഴ‌ത്തെ ബന്ധം നിങ്ങളുടെ ഓര്‍മ്മക്കുറിപ്പിലേയ്ക്കു് ചേര്‍ക്കുക" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "സ്ക്രീന്‍ഷോട്ട് എടുക്കുക" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "സജീവമായ സമ്പര്‍ക്കത്തിന്റെ സ്ക്രീന്‍ഷോട്ട് എടുക്കുക" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Ctrl-Alt-Del(കണ്ട്രോള്‍-ഓള്‍ട്-ഡെല്‍) സജീവമായ കണക്ഷനിലേക്ക് അയയ്ക്കുക " - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "ഇപ്പോഴത്തെ ഉപകരണം മുഴുവന്‍ ദൃശ്യപ‌രിധിയിലായി കാണുക." -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "(_O)നേരായ വലിപ്പം" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "ജാലകം വിദൂര പണിയിടത്തിന്റെ വലിപ്പത്തിലേക്ക് മാറ്റുന്നു." - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "_വലിപ്പം മാറ്റല്‍" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "റിമോട്ട് സ്ക്രീന്‍ നിലവിലുള്ള ജാലക വലിപ്പത്തിലേക്ക് ആക്കുക" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_തുറക്കാന്‍ മാത്രം (റീഡ് ഒണ്‍ളി)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "മൌസും കീബോര്‍ഡും പ്രാവര്‍ത്തികമല്ലാക്കുക" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_ഉപകരണപ്പട്ട" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "ഉപകരണപ്പട്ട കാണിയ്ക്കുകയോ മറയ്ക്കുകയോ ചെയ്യുക" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_‌സ്ഥിതിവിവരപ്പട്ട" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "സ്ഥിതിവിവരപ്പട്ട കാണിയ്ക്കുകയോ മറയ്ക്കുകയോ ചെയ്യുക" +#: ../vinagre/vinagre-utils.c:75 +msgid "An error has occurred:" +msgstr "താഴെ പറയുന്ന തെറ്റു് പറ്റിയിട്ടുണ്ടു്:" -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "വശത്തുള്ള _പാളി" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +#| msgid "Could not open the file." +msgid "Could not load builder file: %s" +msgstr "ബിള്‍ഡര്‍ ഫയല്‍ തുറക്കുവാന്‍ സാധ്യമല്ല: %s" + +#: ../vinagre/vinagre-utils.c:453 +#| msgid "Vinagre is a VNC client for the GNOME Desktop" +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "വിനാഗ്രെ ഗ്നോം പണിയിടത്തിനായുള്ള ഒരു വിദൂര പണിയിട ദര്‍ശിനിയാണു്" -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "വശത്തുള്ള പാളി കാണിയ്ക്കുകയോ മറയ്ക്കുകയോ ചെയ്യുക" +#: ../vinagre/vinagre-utils.c:456 +msgid "" +"Vinagre 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 "" +"വിനാഗ്രെ ഒരു സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ ആണു്; നിങ്ങള്‍ക്കു് സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ ഫൌണ്ടേഷന്‍ " +"പ്രസിദ്ധീകരിച്ച ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സ് അനുസരിച്ചു് നിങ്ങള്‍ക്കിതു് വീണ്ടും വിതരണം ചെയ്യാവുന്നതും " +"മാറ്റങ്ങള്‍ വരുത്താവുന്നതുമാണു്; ലൈസന്‍സിന്റെ ലക്കം 2 അല്ലെങ്കില്‍ (നിങ്ങള്‍ തെരഞ്ഞെടുക്കുന്ന) അതിനു് " +"ശേഷമുള്ള ഏതെങ്കിലും ലക്കമോ ഉപയോഗിക്കാം." -#: ../src/vinagre-utils.c:75 -#| msgid "The following error has occurred:" -#| msgid_plural "The following errors have occurred:" -msgid "An error has occurred:" -msgstr "താഴെ പറയുന്ന തെറ്റു് പറ്റിയിട്ടുണ്ടു്:" +#: ../vinagre/vinagre-utils.c:460 +msgid "" +"Vinagre 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 "" +"വിനാഗ്രെ നിങ്ങള്‍ക്കു് പ്രയോജനപ്പെടും എന്ന പ്രതീക്ഷയില്‍ വിതരണം ചെയ്യുന്നതാണു്, പക്ഷേ, ഇതിനു് ഒരു " +"വാറണ്ടിയും ലഭ്യമല്ല; വ്യാപാരയോഗ്യതയോ ഒരു പ്രത്യേക കാര്യത്തിനു് ചേരുന്നതാണെന്നോ പരോക്ഷമായി " +"ഉള്‍‌ക്കൊള്ളുന്ന വാറണ്ടി പോലും ഇല്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്കു് ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സ് കാണുക." -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "വിനാഗ്രെ ഗ്നോം പണിയിടത്തിനായുള്ള ഒരു വിഎന്‍സി ക്ലയന്റാണു്" - -#: ../src/vinagre-utils.c:436 -msgid "Vinagre 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 "വിനാഗ്രെ ഒരു സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ ആണു്; നിങ്ങള്‍ക്കു് സ്വതന്ത്ര സോഫ്റ്റ്‌വെയര്‍ ഫൌണ്ടേഷന്‍ പ്രസിദ്ധീകരിച്ച ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സ് അനുസരിച്ചു് നിങ്ങള്‍ക്കിതു് വീണ്ടും വിതരണം ചെയ്യാവുന്നതും മാറ്റങ്ങള്‍ വരുത്താവുന്നതുമാണു്; ലൈസന്‍സിന്റെ ലക്കം 2 അല്ലെങ്കില്‍ (നിങ്ങള്‍ തെരഞ്ഞെടുക്കുന്ന) അതിനു് ശേഷമുള്ള ഏതെങ്കിലും ലക്കമോ ഉപയോഗിക്കാം." - -#: ../src/vinagre-utils.c:440 -msgid "Vinagre 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 "വിനാഗ്രെ നിങ്ങള്‍ക്കു് പ്രയോജനപ്പെടും എന്ന പ്രതീക്ഷയില്‍ വിതരണം ചെയ്യുന്നതാണു്, പക്ഷേ, ഇതിനു് ഒരു വാറണ്ടിയും ലഭ്യമല്ല; വ്യാപാരയോഗ്യതയോ ഒരു പ്രത്യേക കാര്യത്തിനു് ചേരുന്നതാണെന്നോ പരോക്ഷമായി ഉള്‍‌ക്കൊള്ളുന്ന വാറണ്ടി പോലും ഇല്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്കു് ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സ് കാണുക." - -#: ../src/vinagre-utils.c:444 -msgid "You should have received a copy of the GNU General Public License along with this program. If not, see ." -msgstr "നിങ്ങള്‍ക്കു് ഈ പ്രോഗ്രാമിനൊപ്പം ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പു് ലഭിച്ചിട്ടുണ്ടായിരിയ്ക്കണം. ഇല്ലെങ്കില്‍ കാണുക." +#: ../vinagre/vinagre-utils.c:464 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"this program. If not, see ." +msgstr "" +"നിങ്ങള്‍ക്കു് ഈ പ്രോഗ്രാമിനൊപ്പം ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പു് " +"ലഭിച്ചിട്ടുണ്ടായിരിയ്ക്കണം. ഇല്ലെങ്കില്‍ കാണുക." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Arun.K.R|അരുണ്‍.കെ.ആര്‍ \n" "Praveen A|പ്രവീണ്‍ അരിമ്പ്രത്തൊടിയില്‍\n" "Harivishnu VN|ഹരിവിഷ്ണു വിഎന്‍ " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "വിനാഗ്രെയുടെ വെബ്ബ്സൈറ്റ്" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "%s: എന്ന വിനാഗ്രെ-യുഐ.എക്സ്എംഎല്‍ (vinagre-ui.xml) ഒന്നിച്ചുചേര്‍ക്കാന്‍ സാധിക്കില്ല" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_അടുത്തിടെയുള്ള ബന്ധങ്ങള്‍" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s:%d തുറക്കുക" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "കര്‍സറിനെ വിടുന്നതിനായിട്ടു് Ctrl+Alt അമര്‍ത്തുക" - -#~ msgid "Editing a bookmark" -#~ msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ പരിശോധിയ്ക്കുക" -#~ msgid "Enter a name for this connection" -#~ msgstr "ഈ ബന്ധത്തിനു് ഒരു പേരു് നല്‍കുക" -#~ msgid "" -#~ "In order to connect on this machine, a password is required. Please " -#~ "supply it." -#~ msgstr "" -#~ "ഈ മഷീനിലേയ്ക്കു് ബന്ധപ്പെടുന്നതിനു് ഒരു അടയാളവാക്കു് ആവശ്യമുണ്ടു്. ദയവായി അതു നല്കുക." -#~ msgid "Editing a bookmark" -#~ msgstr "ഓര്‍മ്മക്കുറിപ്പുകള്‍ പരിശോധിയ്ക്കുക" -#~ msgid "Saving to bookmarks" -#~ msgstr "ഓര്‍മ്മക്കുറിപ്പിലേയ്ക്കു് സംഭരിക്കുക " -#~ msgid "_Bookmark name:" -#~ msgstr "_ഓര്‍മ്മക്കുറിപ്പുകളുടെ പേരുകള്‍:" -#~ msgid "Error: %s" -#~ msgstr "പിശക് : %s" -#~ msgid "Confirm removal?" -#~ msgstr "നീക്കംചെയ്യുന്നതു് ഉറപ്പാക്കുക?" -#~ msgid "Error while removing %s from bookmarks: %s" -#~ msgstr "%s ഓര്‍മ്മക്കുറിപ്പുകളില്‍ നിന്നു് മാ‌യ്ക്കുമ്പോള്‍ തെറ്റു്:%s" -#~ msgid "" -#~ "Scaling does not work properly on composited windows. Disable the visual " -#~ "effects and try again." -#~ msgstr "" -#~ "വലിപ്പം മാറ്റല്‍ കോമ്പോസിറ്റഡ് ജാലകങ്ങളില്‍ ശരിയായി പ്രവര്‍ത്തിക്കുന്നതല്ല. ദ്രശ്യ പ്രഭാവങ്ങള്‍ " -#~ "പ്രാവര്‍ത്തികമല്ലാതാക്കി വീണ്ടും ശ്രമിക്കുക." - diff -Nru vinagre-2.26.1/po/mr.po vinagre-2.29.1/po/mr.po --- vinagre-2.26.1/po/mr.po 2009-04-13 14:28:57.000000000 +0100 +++ vinagre-2.29.1/po/mr.po 2009-08-31 17:49:23.000000000 +0100 @@ -1,27 +1,28 @@ -# translation of vinagre.HEAD.mr.po to marathi +# translation of mr.po to Marathi # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Sandeep Shedmake , 2008, 2009. +# Sandeep Shedmake , 2009. msgid "" msgstr "" -"Project-Id-Version: vinagre.HEAD.mr\n" +"Project-Id-Version: mr\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-20 20:31+0000\n" -"PO-Revision-Date: 2009-04-07 10:30+0530\n" -"Last-Translator: Sandeep Shedmake \n" -"Language-Team: marathi\n" +"POT-Creation-Date: 2009-08-25 12:02+0000\n" +"PO-Revision-Date: 2009-08-31 17:45+0530\n" +"Last-Translator: Sandeep Shedmake \n" +"Language-Team: Marathi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "विषयी (_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "मदत (_H)" @@ -30,123 +31,129 @@ msgstr "दूरस्थ डेस्कटॉप करीता प्रवेश" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "दूरस्थ डेक्टॉप प्रदर्शक" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "ओळख पटवणे आवश्यक आहे" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "जुळवणी पर्याय" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "जुळवणी" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "फोल्डर" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "संवाद" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "पर्याय" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "मुख्य फोल्डर" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "तुम्हाला कुठल्या संगणकाशी जुळवणी करायची आहे?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "वरील सर्व क्षेत्र अनिवार्य आहे" +#: ../data/vinagre.ui.h:1 +#| msgid "All fields above are mandatory" +msgid "All fields above are mandatory" +msgstr "वरील सर्व क्षेत्र अनिवार्य आहे" + +#: ../data/vinagre.ui.h:2 +#| msgid "Authentication is required" +msgid "Authentication is required" +msgstr "ओळख पटवणे आवश्यक आहे" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" -msgstr "पुस्तकखुण" +msgstr "पुस्तकखूण" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +#| msgid "Connecting..." +msgid "Connection" +msgstr "जुळवणी" + +#: ../data/vinagre.ui.h:5 +#| msgid "Connection options" +msgid "Connection options" +msgstr "जुळवणी पर्याय" + +#: ../data/vinagre.ui.h:6 +#| msgid "New Folder" +msgid "Folder" +msgstr "फोल्डर" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "यजमान:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +#| msgid "Interface" +msgid "Interface" +msgstr "संवाद" + +#: ../data/vinagre.ui.h:9 +#| msgid "Options" +msgid "Options" +msgstr "पर्याय" + +#: ../data/vinagre.ui.h:10 +#| msgid "Parent Folder" +msgid "Parent Folder" +msgstr "मुख्य फोल्डर" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "आवड निवड" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "एकच सक्रीय जुळवणी अस्तित्वात असल्यावर मेन्यू प्रवेगक (शार्टकट कि) दर्शवायचे" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "मेन्यू प्रवेगक (शार्टकट कि) दर्शवायचे" +#: ../data/vinagre.ui.h:12 +#| msgid "Which machine do you want to connect to?" +msgid "Which machine do you want to connect to?" +msgstr "तुम्हाला कुठल्या संगणकाशी जुळवणी करायची?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "नेहमी टॅब दाखवा (_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "ओळख पटवा (_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "पूर्ण पडदा (_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "यजमान (_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "नाव (_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "परवलीचा शब्द(_P):" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "प्रोटोकॉल (_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "श्रेय लक्षात ठेवा (_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "प्रमाण (_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "मेन्यू शार्टकट दाखवा (_S)" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "वापरकर्त्याचे नाव (_U):" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "फक्त दृश्य (_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "सक्रीय प्लगइन्स्" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "यजमान किंवा यजमान:दृश्य किंवा यजमान::पोर्ट" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"सक्रीय प्लगइन्स्ची सूची. त्यात सक्रीय प्लगइन्स्चे \"Location\" समाविष्टीत आहे. " +"पुरवलेल्या प्लगइनचे \"Location\" प्राप्त करण्यासाठी .vinagre-प्लगइन फाइल पहा." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "जुळवणी संवाद अंतर्गत इतिहास घटकाची कमाल संख्या" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -156,7 +163,7 @@ "\"खरे\" निश्चित करा. लक्षात ठेवा कार्यान्वीत असल्यावर, कि मेन्यू द्वारे वापरले जातिल व " "दूरस्थ यजमान त्या कि वापरू शकणार नाही." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -164,15 +171,15 @@ "नेहमी टॅब दर्शविण्याकरीता \"खरे\" असे निश्चित केले जाते. टॅब दर्शविण्याकरीता एकापेक्षा जास्त " "सक्रीय जुळवणी आढळल्यास \"खोटे\" असे निश्चित केले जाते." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "यजमान उतरते पर्याय निवड अंतर्गत घटकांची कमाल संख्या निश्चित करतो." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" URL करीता हाताळणी" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -182,10 +189,18 @@ "किंवा अस्तित्वातील जुळवणी विषमरित्या तोडण्यास विनंती करतो. अन्य क्लाऐंटशी डेस्कटॉप " "सहभागीय करण्याकरीता मुल्यास खरे असे निश्चित करा." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "अन्य जुळलेले क्लाऐंट करीता लक्ष्य द्यायचे" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "एकच सक्रीय जुळवणी अस्तित्वात असल्यावर मेन्यू प्रवेगक (शार्टकट कि) दर्शवायचे" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "मेन्यू प्रवेगक (शार्टकट कि) दर्शवायचे" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "दूरस्थ डेस्कटॅप (VNC) फाइल" @@ -194,539 +209,757 @@ msgid "Remote Desktop Connection" msgstr "दूरस्थ डेस्कटॉप जुळवणी" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux टर्मिनल्स् करीता प्रवेश करा" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "पोर्ट:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH समर्थन" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "'shared' फ्लॅग करीता चुकीचे मूल्य: %d. 0 किंवा 1 असायला हवे होते. दुर्लक्ष करत आहे." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "प्रमाणीत मोड कार्यक्षम करा" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC पर्याय:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC पर्याय दाखवा" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows व इतर मशीन्स् करीता प्रवेश मिळवा." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "फाइल वाचणे अशक्य." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "फाइलचे रूपण VNC असे नाही: गट \"connection\" आढळले नाही." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "फाइलचे रूपण VNC असे नाही: कि \"host\" आढळली नाही." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC पर्याय" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "फक्त दृश्य (_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "प्रमाण (_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC फाइल्स्" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "डेस्कटॉपचे नाव:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "परिमाण:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "यजमानशी जुळवणी स्थापीत करतेवेळी त्रुटी." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +#| msgid "Authentication method to host %s is unsupported. (%u)" +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "यजमान %s करीता ओळख पटवणे पध्दती समर्थीत नाही. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "ओळख पटवणे असमर्थीत आहे" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "ओळख पटवतेवेळी त्रुटी" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "या मशीन करीता प्रवेशसाठी वापरकर्ता नाव आवश्यक आहे." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "या मशीन करीता प्रवेशसाठी परवलीचा शब्द आवश्यक आहे." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "प्रमाणकृत (_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +#| msgid "Fit the remote screen into the current window size" +msgid "Fits the remote screen into the current window size" +msgstr "दूरस्थ पडदा सध्याच्या खिडकीच्या आकारात बसवा" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +#| msgid "Disable mouse and keyboard" +msgid "Does not send mouse and keyboard events" +msgstr "माऊस व कळफलक घटना पाठवू नका" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "मुळ आकार (_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "दूरस्थ डेस्कटॉपच्या आकार करीता खिडकी सुस्थीत करतो" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del पाठवा" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +#| msgid "Send Ctrl+Alt+Del to active connection" +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Ctrl+Alt+Del दूरस्थ मशीनकरीता पाठवतो" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "प्रमाण" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "फक्त वाचणीय" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"प्रमाण या प्रतिष्ठापन करीता समर्थीत नाही.\n" +"\n" +"हे गुणविशेष कार्यान्वीत करण्याकरीता README फाइल (Vinagre सह संग्रहीत केलेले) वाचा." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC समर्थन" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "दूरस्थ मशीनशी जलद जुळवणी करीता मेन्यू" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre ऍपलेट फॅक्ट्री" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "vinagre चालवणे अशक्य:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "मुक्त दूरस्थ डेक्टॉप प्रदर्शक" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" -msgstr "पुस्तकखुण प्राप्त करा" +msgstr "पुस्तकखूण प्राप्त करा" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "शिष्टाचार %s समर्थीत नाही." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" -msgstr "पुस्तकखुण प्रारंभ करतेवेळी त्रुटी: %s" +msgstr "पुस्तकखूण प्रारंभ करतेवेळी त्रुटी: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "अपरिचीत त्रुटी" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" -msgstr "पुस्तकखुणा प्रारंभ करतेवेळी त्रुटी: फाइल रिकामी नुरूप आढळली" +msgstr "पुस्तकखूणा प्रारंभ करतेवेळी त्रुटी: फाइल रिकामी नुरूप आढळली" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "पुस्तकखुणा प्रारंभ करतेवेळी त्रुटी: फाइल vinagre पुस्तकखुण फाइल नाही" +msgstr "पुस्तकखूणा प्रारंभ करतेवेळी त्रुटी: फाइल vinagre पुस्तकखूण फाइल नाही" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" -msgstr "पुस्तकखुण साठवतेवेळी त्रुटी: XML मांडणी बनविण्यास अपयशी" +msgstr "पुस्तकखूण साठवतेवेळी त्रुटी: XML मांडणी बनविण्यास अपयशी" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" -msgstr "पुस्तकखुण साठवतेवेळी त्रुटी: XML मांडणी प्रारंभ करण्यास अपयशी" +msgstr "पुस्तकखूण साठवतेवेळी त्रुटी: XML मांडणी प्रारंभ करण्यास अपयशी" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" -msgstr "पुस्तकखुण साठवतेवेळी त्रुटी आढळली: XML मांडणी निश्चित करण्यास अपयशी" +msgstr "पुस्तकखूण साठवतेवेळी त्रुटी आढळली: XML मांडणी निश्चित करण्यास अपयशी" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" -msgstr "पुस्तकखुण साठवतेवेळी त्रुटी: %s" +msgstr "पुस्तकखूण साठवतेवेळी त्रुटी: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" -msgstr "पुस्तकखुण स्थानांतरनवेळी त्रुटी आढळली: XML मांडणी बनविण्यास अपयशी" +msgstr "पुस्तकखूण स्थानांतरनवेळी त्रुटी आढळली: XML मांडणी बनविण्यास अपयशी" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" -msgstr "पुस्तकखुण स्थानांतरनवेळी त्रुटी आढळली: XML मांडणी प्रारंभ करण्यास अपयशी" +msgstr "पुस्तकखूण स्थानांतरनवेळी त्रुटी आढळली: XML मांडणी प्रारंभ करण्यास अपयशी" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" -msgstr "पुस्तकखुण स्थानांतरनवेळी त्रुटी आढळली: XML मांडणी निश्चित करण्यास अपयशी" +msgstr "पुस्तकखूण स्थानांतरनवेळी त्रुटी आढळली: XML मांडणी निश्चित करण्यास अपयशी" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" -msgstr "पुस्तकखुण स्थानांतरनवेळी त्रुटी आढळली: %s" +msgstr "पुस्तकखूण स्थानांतरनवेळी त्रुटी आढळली: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +#| msgid "Error while migrating bookmarks: %s" +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "पुस्तकखूण स्थानांतरीत करतेवेळी त्रुटी: VNC प्लगइन सक्रीय केले नाही" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "डिरेक्ट्री बनविण्यास अपयशी" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." -msgstr "पुस्तकखुण फाइल नवीन स्वरूपात स्थानांतरीत करत आहे. हे कार्य फक्त एकदाच चालवा." +msgstr "पुस्तकखूण फाइल नवीन स्वरूपात स्थानांतरीत करत आहे. हे कार्य फक्त एकदाच चालवा." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" -msgstr "पुस्तकखुण फाइल उघडतेवेळी त्रुटी आढळली: %s" +msgstr "पुस्तकखूण फाइल उघडतेवेळी त्रुटी आढळली: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "स्थानांतरन रद्द केले" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" -msgstr "जुणी पुस्तकखुण फाइल काढूण टकाणे शक्य नाही" +msgstr "जुणी पुस्तकखूण फाइल काढूण टकाणे शक्य नाही" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "रूट फोल्डर" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "या फोल्डर करीता अवैध नाव" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "The name \"%s\" is already used in this folder. Please use a different name." msgstr "नाव \"%s\" आधिपासूनच या फोल्डर अंतर्गत वापरले गेले आहे. कृपया इतर नाव वापरा." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 -#| msgid "Invalid name for this folder" +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "या घटक करीता अवैध नाव" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(प्रोटोकॉल: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "तुम्हाला नक्की पुस्तकखुण पासून %s काढूण टाकायचे?" +#| msgid "Are you sure you want to remove %s from bookmarks?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "तुम्हाला नक्की पुस्तकखूण पासून %s काढून टाकायचे?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "फोल्डर काढूण टाकायचे?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "सर्व उपफोल्डर व त्याचे घटक काढून टाकले जाते याच्याकडे विशेष लक्ष द्या." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "घटक काढूण टाकायचे?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" -msgstr "पुस्तकखुण काढूण टाकतेवेळी त्रुटी: नोंदणी आढळली नाही" +msgstr "पुस्तकखूण काढूण टाकतेवेळी त्रुटी: नोंदणी आढळली नाही" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "नवीन फोल्डर" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "फाइल निवडा" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "समर्थीत स्वरूपन" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "कुठलेही असमर्थात फाइल्स् आढळले नाही" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "कुठलेही सक्रीय प्लगइन्स् उघडण्याकरीता समर्थीत फाइल पुरवत नाही. काहिक प्लगइन्स् सक्रीय करा व पुनः प्रयत्न करा." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "खालील फाइल उघडले जाऊ शकले नाही:" msgstr[1] "खालील फाइलं उघडले जाऊ शकले नाही:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "प्रोटोकॉल सूचीमध्ये सक्रीय प्रोटोकॉल प्राप्त करणे अशक्य." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "इतिहास फाइल साठवतेवेळी त्रुटी: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "VNC सर्वर निवडा" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "शिष्टाचार %s समर्थीत नाही." +#: ../vinagre/vinagre-connect.c:340 +#| msgid "Open Remote Desktop Viewer" +msgid "Choose a Remote Desktop" +msgstr "दूरस्थ डेक्टॉप नीवडा" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "फाइल उघडणे अशक्य." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "फाइल वाचणे अशक्य." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "फाइल कुठल्याही प्लगइन्स् द्वारे ओळखली गेली नाही." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "'shared' फ्लॅग करीता चुकीचे मूल्य: %d. 0 किंवा 1 असायला हवे होते. दुर्लक्ष करत आहे." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "फाइल अंतर्गत यजमान पत्ता आढळले नाही." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "अवैध कार्य" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "ओढा व टाका कार्य पासून प्राप्त डेटा अवैध आहे (&d)." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "जवळीक यजमान" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr ".vnc फाइल उघडते" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "फाइलनाव" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "vinagre ला पडदाभर पद्धतीत उघडा" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "vinagre च्या वर्तमान कार्यरत पद्धतीत नवीन उच्चस्तरीय चौकट बनवा" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "vinagre द्वारे परिचीत फाइल उघडा" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "फाइलनाव" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" -msgstr "[सर्वर:पोर्ट]" +msgstr "[सर्व्हर:पोर्ट]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "खालील त्रुटी आढळले:" msgstr[1] "खालील त्रुटी आढळले:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- GNOME करीता VNC क्लाऐंट" +#: ../vinagre/vinagre-main.c:169 +#| msgid "Remote Desktop Viewer" +msgid "- Remote Desktop Viewer" +msgstr "- दूरस्थ डेस्कटॉप प्रदर्शक" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "उपलब्ध आदेश ओळ पर्याय पहाण्याकरीता 'vinagre --help' चालवा" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "avahi यजमाननाव निर्धारण अपयशी: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "प्लगइन %s ने सेवा %s करीता आधिपासूनच ब्राऊजर पंजीकृत केले." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to add mDNS browser for service %s." +msgstr "सेवा %s करीता mDNS ब्राऊजर समावेश करण्यास अपयशी." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "यजमान करीता संचारण अपयशी: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS ब्राऊजर सुरू करण्यास अपयशी: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "यजमान %s करीता जुळवणी बंद केले." +#| msgid "Connection to host %s was closed." +msgid "Connection to host %s was closed." +msgstr "यजमान %s शी जुळवणी खंडीत झाली." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "जुळवणी बंद केले" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +#| msgid "Authentication to host %s has failed" +msgid "Authentication to host %s has failed" +msgstr "यजमान %s ची ओळख पटली नाही" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "ओळख पटवणे अपयशी" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "जुळवत आहे..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "जुळवणी बंद करा" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "प्लगइन व्यवस्थापक" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "प्लगइन" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "सक्षम केले" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "संरचीत करा (_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "सक्रीय करा (_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "सर्व सक्रीय करा (_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "सर्व असक्रीय (_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +#| msgid "_About" +msgid "_About Plugin" +msgstr "प्लगइन विषयी (_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "प्लगइन संरचीत करा (_o)" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "प्राधान्य क्रम व्यवस्थापक मुळापासून सुरू करणे अशक्य आहे." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "यजमानशी जुळवणी स्थापीत करतेवेळी त्रुटी." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "यजमान %s करीता ओळख पटवणे अपयशी" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "ओळख पटवणे अपयशी" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "यजमान %s करीता ओळख पटवणे पध्दती असमर्थीत आहे. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "ओळख पटवणे असमर्थीत आहे" +#: ../vinagre/vinagre-tab.c:346 +#| msgid "_Full screen" +msgid "Leave fullscreen" +msgstr "पडदाभरपासून बाहेर पडा" -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "अलिकडील जुळवणी साठवतेवेळी त्रुटी." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "किरींग वरील परवलीचा शब्द साठवतेवेळी त्रुटी आढळली." - -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "ओळख पटवतेवेळी त्रुटी" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "या मशीन करीता प्रवेशसाठी वापरकर्ता नाव आवश्यक आहे." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "या मशीन करीता प्रवेशसाठी परवलीचा शब्द आवश्यक आहे." +#: ../vinagre/vinagre-tab.c:728 +#| msgid "Error saving the credential on the keyring." +msgid "Error saving the credentials on the keyring." +msgstr "किरींग वरील श्रेय साठवतेवेळी त्रुटी आढळली." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "खिडकी लहान करा" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "प्रमाण" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "जुळवणीचे स्क्रीनशॉट प्राप्त करणे शक्य नाही." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "फक्त वाचणीय" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "स्क्रीनशॉट संचयीत करा" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "स्क्रीनशॉट घ्या" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s चे स्क्रीनशॉट" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del पाठवा" +#: ../vinagre/vinagre-tab.c:881 +#| msgid "Error saving recent connection." +msgid "Error saving screenshot" +msgstr "स्क्रीनशॉट साठवतेवेळी त्रुटी" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "डेस्कटॉपचे नाव:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "सेवा गुणधर्म प्राप्त करणे असंभव: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "पोर्ट:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +#| msgid "Failed to create the directory" +msgid "Impossible to create the connection: %s" +msgstr "जुळवणी निर्माण करणे असंभव: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "परिमाण:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "स्ट्रीम ट्यूब स्वीकारणे असंभव: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "जुळवणीचे स्क्रीनशॉट प्राप्त करणे शक्य नाही." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "संपर्क नाव प्राप्त करणे असंभव: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s चे स्क्रीनशॉट" +msgid "Impossible to get the avatar: %s" +msgstr "अवतार प्राप्त करणे असंभव: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "स्क्रीनशॉट संचयीत करा" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s ला डेस्कटॉप तुमच्याशी शेअर करायचा आहे." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"प्रमाण या प्रतिष्ठापन करीता समर्थीत नाही.\n" -"\n" -"हे गुणविशेष कार्यान्वीत करण्याकरीता README फाइल (Vinagre सह संग्रहीत केलेले) वाचा." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "डेस्कटॉप शेअरींग आमंत्रण" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "मशीन (_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "संपादन (_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "दृश्य (_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" -msgstr "पुस्तकखुण(_B)" +msgstr "पुस्तकखूण(_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "दूरस्थ मशीनसह जुळवणी स्थापीत करा" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr ".VNC फाइल उघडा" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "कार्यक्रम सोडून द्या" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "अनुप्रयोग आवड निवड संपादीत करा" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" -msgstr "पुस्तकखुण उघडा (_O)" +msgstr "पुस्तकखूण उघडा (_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "या मशीनसह जुळवणी स्थापीत करा" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" -msgstr "पुस्तकखुण संपादीत करा (_E)" +msgstr "पुस्तकखूण संपादीत करा (_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "निवडलेल्या ओळकचिन्हाचे तपशील संपादीत करा" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "ओळचिन्ह पासून काढूण टाका (_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" -msgstr "पुस्तकखुण पासून सद्याची निवडलेली जुळवणी काढूण टाका" +msgstr "पुस्तकखूण पासून सद्याची निवडलेली जुळवणी काढूण टाका" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "नवीन फोल्डर (_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "नवीन फोल्डर बनवा" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "विषयसूची (_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "vinagre पुस्तिका उघडा" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "या अनुप्रयोग विषयी" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "साधनपट्टी (_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "साधनपट्टी दाखवा अथवा लपवा" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "स्थितीपट्टी(_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "स्थितीदर्शकपट्टी दाकवा अगर लपवा" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "बाजूचे पटल (_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "बाजूचे पटल लपवा किंवा दर्शवा" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "सध्याचा संपर्क बंद करा" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "सर्व बंद करा (_l)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "सर्व सक्रीय जुळवणी बंद करा" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" -msgstr "पुस्तकखुण करीता जोडा (_A)" +msgstr "पुस्तकखूण करीता जोडा (_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" -msgstr "पुस्तकखुण करीता सद्याची जुळवणी जोडा" +msgstr "पुस्तकखूण करीता सद्याची जुळवणी जोडा" + +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "स्क्रीनशॉट घ्या" -#: ../src/vinagre-ui.h:86 +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "सक्रीय जुळवणीचे स्क्रीनशॉट घ्या" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "जुळवणी सक्रीय करण्याकरीता Ctrl+Alt+Del पाठवा" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "सद्याचे मशीन पूर्ण पडद्यावर पहा" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "मुळ आकार (_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "दूरस्थ डेस्कटॉपच्या आकार करीता खिडकी सुस्थीत करतो" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "प्रमाणकृत (_c)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "दूरस्थ पडदा वर्तमान चौकट आकारात बसवा" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "फक्त वाचणीय (_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "माऊस व कळफलक अकार्यान्वीत करा" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "साधनपट्टी (_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "साधनपट्टी दाखवा अथवा लपवा" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "स्थितीपट्टी(_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "स्थितीदर्शकपट्टी दाकवा अगर लपवा" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "बाजूचे पटल (_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "बाजूचे पटल लपवा किंवा दर्शवा" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "त्रुटी आढळली:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "GNOME डेस्कटॉप करीता Vinagre हे एक VNC क्लाऐंट आहे" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +#| msgid "Could not open the file." +msgid "Could not load builder file: %s" +msgstr "बिल्डर फाइल लोड करणे अशक्य: %s" + +#: ../vinagre/vinagre-utils.c:453 +#| msgid "Vinagre is a VNC client for the GNOME Desktop" +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "GNOME डेस्कटॉपकरीता Vinagre दूरस्थ डेस्कटॉप प्रदर्शक आहे" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -738,7 +971,7 @@ "Foundation; either version 2 of the License, or (at your option) any later " "version." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -750,7 +983,7 @@ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -758,30 +991,26 @@ "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" -msgstr "translator-credits" +msgstr "संदिप शेडमाके , 2008, 2009; संदिप शेडमाके , 2009." -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre संकेतस्थळ" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml एकत्र करू शकले नाही: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "अलिकडील जुळवणी (_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s उघडा:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "कर्सर अकार्यान्वीत करण्याकरीता Ctrl+Alt दाबू नका" - diff -Nru vinagre-2.26.1/po/nb.po vinagre-2.29.1/po/nb.po --- vinagre-2.26.1/po/nb.po 2009-04-13 14:28:57.000000000 +0100 +++ vinagre-2.29.1/po/nb.po 2009-09-06 13:39:31.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: vinagre 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-05 12:11+0200\n" -"PO-Revision-Date: 2009-04-05 12:12+0200\n" +"POT-Creation-Date: 2009-09-01 14:22+0200\n" +"PO-Revision-Date: 2009-09-01 14:28+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" "MIME-Version: 1.0\n" @@ -16,11 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Om" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Hjelp" @@ -29,124 +29,118 @@ msgstr "Bruk eksternt skrivebord" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Visning av eksternt skrivebord" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Autentisering kreves" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Alternativer for tilkobling" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Tilkobling" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Mappe" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Grensesnitt" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Alternativer" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Opphavsmappe" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Hvilken maskin vil du koble til?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Alle felt over må fylles ut" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Alle felt over må fylles ut" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Autentisering kreves" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Bokmerker" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Tilkobling..." + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Alternativer for tilkobling" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Mappe" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Vert:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Grensesnitt" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Alternativer" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Opphavsmappe" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Brukervalg" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "Om faner skal vises selv om det bare er en aktiv tilkobling" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Hvilken maskin vil du koble til?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Om hurtigtaster for menyene skal vises (snarveitaster)" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Alltid vis faner" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Autentiser" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Fullskjerm" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Vert:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Navn:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Passord:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokoll:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Husk dette passordet" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Skalering" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "Vi_s menysnarveier" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "Br_ukernavn:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Ba_re se" - -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "vert, vert:skjerm eller vert::port" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Aktive tillegg" + +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "Liste med aktive tillegg. Den inneholder «Lokasjon» for aktive tillegg. Se .vinagre-plugin-filen for å finne «Lokasjon» for et gitt tillegg." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Maksimalt antall historikkoppføringer i tilkoblingsdialogen" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -156,7 +150,7 @@ "på. Merk at hvis de er slått på vil disse tastene fanges av menyen og ikke " "bli sendt til ekstern vert." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -164,15 +158,15 @@ "Sett til «true» for å alltid vise faner. Settes denne til «false» vil faner " "kun vises når det er mer enn en aktiv tilkobling." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Oppgir maksimalt antall oppføringer i vertsmenyen." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Håndterer for «vnc://»-URLer" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -182,10 +176,19 @@ "forbli tilkoblet eller om disse skal kobles fra. Sett verdien til «true» for " "å dele skrivebordet med andre klienter." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Om andre klienter skal kunne forbli tilkoblet" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Om faner skal vises selv om det bare er en aktiv tilkobling" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Om hurtigtaster for menyene skal vises (snarveitaster)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Fil for eksternt skrivebord (VNC)" @@ -194,94 +197,274 @@ msgid "Remote Desktop Connection" msgstr "Ekstern skrivebordstilkobling" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Aksesser Unix-/Linux-terminaler" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH-støtte" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Ugyldig verdi for flagget «shared»: %d. Verdien skal være 0 eller 1. Overser " +"den." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Slå på skalert modus" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Alternativer for VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Vis Alternativer for VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Tilgang til Unix/Linux, Windows og andre maskiner." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Kunne ikke lese filen." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Denne filen er ikke for VNC: Mangler gruppen «connection»." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Denne filen er ikke for VNC: Mangler nøkkel «host»." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Alternativer for VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Ba_re se" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Skalering" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC-filer" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Skrivebordsnavn:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensjoner:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Feil ved tilkobling til verten." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Autentiseringsmetoden mot verten %s er ikke støttet. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Autentisering er ikke støttet" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Feil ved autentisering" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Et brukernavn kreves for å få tilgang til denne maskinen." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Et passord kreves for å få tilgang til denne maskinen." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "S_kalering" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Tilpass ekstern skjerm til størrelsen på aktivt vindu" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Ikke send hendelser for mus og tastatur" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Opprinnelig størrelse" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Justerer vinduet til samme størrelse som eksternt skrivebord" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Sende Ctrl+alt+del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Sender Ctrl+alt+del til ekstern maskin" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Skalering" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Bare se" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Skalering er ikke støttet på denne installasjonen.\n" +"\n" +"Les filen README, som distribueres med Vinagre, for å finne ut hvordan du " +"aktiverer denne funksjonen." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC-støtte" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "En meny for å koble til en ekstern maskin raskt" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Fabrikk for vinagre panelprogram" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Kunne ikke kjøre vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Åpne visning av eksternt skrivebord" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Åpne dine bokmerker" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokoll %s er ikke støttet." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Feil under oppstart av bokmerkene: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Ukjent feil" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Feil under initiering av bokmerker: Filen ser ut til å være tom" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Feil under initiering av bokmerkene: Filen er ikke en bokmerkefil fra vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Feil under lagring av bokmerker: Klarte ikke å lage XML-strukturen" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Feil under lagring av bokmerker: Klarte ikke å initiere XML-strukturen" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Feil under lagring av bokmerker: Klarte ikke å sluttføre XML-strukturen" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Feil under lagring av bokmerker: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Feil under migrering av bokmerker: Klarte ikke å lage XML-strukturen" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Feil udner migrering av bokmerker: Klarte ikke å initiere XML-strukturen" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Feil under migrering av bokmerker: Klarte ikke å sluttføre XML-strukturen" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Feil under migrering av bokmerker: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Feil under migrering av bokmerker: VNC-tillegg er ikke aktivert" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Klarte ikke å lage katalogen" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -289,457 +472,477 @@ "Migrerer bokmerkefilen til det nye formatet. Denne operasjonen skal bare " "kjøres en gang." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Feil under åpning av gammel bokmerkefil: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migrering avbrutt" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Kunne ikke fjerne den gamle bokmerkefilen" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Rotmappe" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Ugyldig navn på denne mappen" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." msgstr "Navnet «%s» er allerede brukt i denne mappen. Velg et annet navn." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Ugyldig navn for denne oppføringen" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokoll: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Er du sikker på at du ønsker å fjerne %s fra bokmerkene?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Er du sikker på at du ønsker å fjerne %s fra bokmerkene?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Fjern mappen?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Merk at alle undermapper og oppføringer vil bli fjernet også." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Fjern oppføring?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Feil under fjerning av bokmerke: Oppføring ikke funnet" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Ny mappe" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Velg fil" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Støttede formater" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Ingen støttede filer" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "Ingen av de aktive tilleggene tilbyr en støttet fil å åpne. Aktiver tillegg og prøv igjen." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Følgende fil kunne ikke bli åpnet:" msgstr[1] "Følgende filer kunne ikke bli åpnet:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Kunne ikke hente aktiv protokoll i listen over protokoller." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Feil under lagring av historikkfil: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Velg en VNC-tjener" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokoll %s er ikke støttet." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Velg et eksternt skrivebord" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Kunne ikke åpne filen." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Kunne ikke lese filen." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Filen ble ikke gjenkjent av noen av tilleggene." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Ugyldig verdi for flagget «shared»: %d. Verdien skal være 0 eller 1. Overser " -"den." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Kunne ikke finne vertsadressen i filen." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Ugyldig operasjon" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Data mottatt fra dra-og-slipp operasjon er ugyldig." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Verter i nærheten" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Åpner en .vnc-fil" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Åpne vinagre i fullskjermmodus" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "filnavn" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Lag et nytt toppvindu i en eksisterende instans av vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Åpne en fil som gjenkjennes av vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "filnavn" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[tjener:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Følgende feil oppsto:" msgstr[1] "Følgende feil oppsto:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- VNC-klient for GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Visning av eksternt skrivebord" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Kjør 'vinagre --help' for å se en liste med tilgjengelige kommandolinjevalg" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Klarte ikke å finne avahi-vertsnavn: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Tillegg %s har allerede registrert en leser for tjeneste %s." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Klarte ikke å legge til mDNS-visning for tjeneste: %s" + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Klarte ikke å se etter verter: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Klarte ikke å initiere mDNS-visning: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Tilkoblingen til verten %s ble lukket." +msgid "Connection to host %s was closed." +msgstr "Tilkobling til vert %s ble lukket." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Tilkobling lukket" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Autentisering mot vert %s feilet" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Autentisering feilet" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Kobler til ..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Lukk tilkobling" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Tilleggshåndterer" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Tillegg" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Aktivert" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "K_onfigurer" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ktiver" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ak_tiver alle" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Deaktiver alle" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Om tillegg" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "K_onfigurer tillegg" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Kan ikke starte opp innstillingshåndtereren." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Feil ved tilkobling til verten." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Autentisering mot verten %s feilet" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Autentisering feilet" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Autentiseringsmetoden mot verten %s er ikke støttet. (%u)" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Forlat fullskjerm" -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Autentisering er ikke støttet" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Feil under lagring av siste tilkobling." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Feil under lagring av passord på nøkkelringen." - -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Feil ved autentisering" +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Feil under lagring av autentiseringsinformasjon på nøkkelringen." -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Et brukernavn kreves for å få tilgang til denne maskinen." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Et passord kreves for å få tilgang til denne maskinen." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimer vindu" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Skalering" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Kunne ikke ta et skjermbilde av tilkoblingen." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Bare se" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Lagre skjermbilde" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Ta skjermbilde" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Skjermbilde av %s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Sende Ctrl+alt+del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Feil under lagring av skjermdump" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Skrivebordsnavn:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Klarte ikke å hente egenskap for tjeneste: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Klarte ikke å lage tilkoblingen: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensjoner:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Kan ikke godta rør for strøm: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Kunne ikke ta et skjermbilde av tilkoblingen." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Kan ikke hente navn på kontakt: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "Skjermbilde av %s" +msgid "Impossible to get the avatar: %s" +msgstr "Kan ikke hente personbilde: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Lagre skjermbilde" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s vil dele skrivebordet sitt med deg." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Skalering er ikke støttet på denne installasjonen.\n" -"\n" -"Les filen README, som distribueres med Vinagre, for å finne ut hvordan du " -"aktiverer denne funksjonen." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Invitasjon til delt skrivebord" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Maskin" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Rediger" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Vis" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Bokmerker" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Koble til en ekstern maskin" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Åpne en .VNC-fil" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Avslutt programmet" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Rediger brukervalg for programmet" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Åpne bokmerke" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Koble til denne maskinen" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Rediger bokmerke" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Rediger detaljene for valgt bokmerke" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Fjern fra bokmerkene" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Fjern gjeldende valgte tilkobling fra bokmerkene" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Ny mappe" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Lag en ny mappe" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Innhold" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Åpne manualen for Vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Om dette programmet" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Verktøylinje" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Vis eller skjul verktøylinjen" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Statuslinje" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Vis eller skjul statuslinjen" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Side_panel" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Vis eller skjul sidepanelet" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Lukk gjeldende tilkobling" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Lukk alle" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Lukk alle aktive tilkoblinger" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Legg til i bokmerker" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Legg til gjeldende tilkobling til dine bokmerker" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Ta skjermbilde" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Ta et skjermbilde av den aktive tilkoblingen" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Send Ctrl+alt+del for å aktivere tilkobling" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Vis gjeldende tilkobling i fullskjerm" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Opprinnelig størrelse" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Justerer vinduet til samme størrelse som eksternt skrivebord" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "S_kalering" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Tilpass ekstern skjerm til størrelsen på aktivt vindu" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "Ba_re se" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Deaktiver mus og tastatur" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Verktøylinje" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Vis eller skjul verktøylinjen" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Statuslinje" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Vis eller skjul statuslinjen" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Side_panel" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Vis eller skjul sidepanelet" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "En feil har oppstått:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre er en VNC-klient for GNOME-skrivebordet" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Kunne ikke laste filen: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre er et program for visning av eksterne skrivebord på GNOME-skrivebordet" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -751,7 +954,7 @@ "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) " "enhver senere versjon." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -762,7 +965,7 @@ "GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET " "BESTEMT FORMÅL. Se GNU General Public License for detaljer." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -770,31 +973,27 @@ "Du skal ha mottatt en kopi av GNU General Public License sammen med dette " "programmet. Hvis ikke, se på ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Kjartan Maraas \n" "Espen Stefansen " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Hjemmeside for Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Klarte ikke å slå sammen vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Siste tilkoblinger" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Åpne %s:%d" - -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Trykk Ctrl + Alt for å slippe pekeren" diff -Nru vinagre-2.26.1/po/or.po vinagre-2.29.1/po/or.po --- vinagre-2.26.1/po/or.po 2009-03-04 01:14:34.000000000 +0000 +++ vinagre-2.29.1/po/or.po 2009-10-05 13:54:05.000000000 +0100 @@ -1,4 +1,4 @@ -# translation of or.po to Oriya +# translation of vinagre.master.or.po to Oriya # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -6,10 +6,10 @@ # Manoj Kumar Giri , 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: or\n" +"Project-Id-Version: vinagre.master.or\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-02-18 20:37+0000\n" -"PO-Revision-Date: 2009-03-03 16:53+0530\n" +"POT-Creation-Date: 2009-09-16 11:11+0000\n" +"PO-Revision-Date: 2009-09-21 01:45+0530\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya \n" "MIME-Version: 1.0\n" @@ -17,13 +17,20 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n\n" "\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" "X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "ବିବରଣୀ (_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "ସାହାଯ୍ୟ (_H)" @@ -32,124 +39,130 @@ msgstr "ସୁଦୂର ଡେସ୍କଟପ ଗୁଡିକୁ ଅଭିଗମ କରନ୍ତୁ" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "ସୁଦୂର ଡେସ୍କଟପ ଦର୍ଶକ" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "ପ୍ରାଧିକରଣ ଆବଶ୍ୟକ" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "ସଂଯୋଗ ବିକଳ୍ପଗୁଡ଼ିକ" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "ସଂଯୋଗ" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "ପୋଲଡ଼ର" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "ଅନ୍ତରାପୃଷ୍ଠ" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "ବିକଳ୍ପଗୁଡ଼ିକ" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "ମୁଖ୍ୟ ଫୋଲଡର" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "କେଉଁ ଯନ୍ତ୍ର ସହିତ ଆପଣ ସଂଯୁକ୍ତ ହେବା ପାଇଁ ଚାହୁଁଛନ୍ତି ?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "ଉପର ଲିଖିତ ସମସ୍ତ କ୍ଷେତ୍ରଗୁଡ଼ିକ ବାଧ୍ୟତାମୁଳକ" +#: ../data/vinagre.ui.h:1 +#| msgid "All fields above are mandatory" +msgid "All fields above are mandatory" +msgstr "ଉପର ଲିଖିତ ସମସ୍ତ କ୍ଷେତ୍ରଗୁଡ଼ିକ ବାଧ୍ୟତାମୁଳକ" + +#: ../data/vinagre.ui.h:2 +#| msgid "Authentication is required" +msgid "Authentication is required" +msgstr "ପ୍ରାଧିକରଣ ଆବଶ୍ୟକ" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "ଚିହ୍ନିତ ସ୍ଥାନଗୁଡିକ" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1066 +#: ../data/vinagre.ui.h:4 +#| msgid "Connecting..." +msgid "Connection" +msgstr "ସଂଯୋଗ" + +#: ../data/vinagre.ui.h:5 +#| msgid "Connection options" +msgid "Connection options" +msgstr "ସଂଯୋଗ ବିକଳ୍ପଗୁଡ଼ିକ" + +#: ../data/vinagre.ui.h:6 +#| msgid "New Folder" +msgid "Folder" +msgstr "ଫୋଲଡର" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "ଆଧାର:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +#| msgid "Interface" +msgid "Interface" +msgstr "ଅନ୍ତରାପୃଷ୍ଠ" + +#: ../data/vinagre.ui.h:9 +#| msgid "Options" +msgid "Options" +msgstr "ବିକଳ୍ପଗୁଡିକ" + +#: ../data/vinagre.ui.h:10 +#| msgid "Parent Folder" +msgid "Parent Folder" +msgstr "ମୁଖ୍ୟ ଫୋଲଡର" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "ପସନ୍ଦଗୁଡ଼ିକ" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "କେବଳ ଗୋଟିଏ ସକ୍ରିୟ ସଂଯୋଗ ଥିବା ସମୟରେ ଆମର ଟେବ ଗୁଡିକୁ ଦେଖାଇବା ଉଚିତ କି ନୁହ" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "ଆମର ତାଲିକା ତ୍ୱରକଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ଉଚିତ କି (ସଂକ୍ଷିପ୍ତ ପଥ କିଗୁଡ଼ିକ)" +#: ../data/vinagre.ui.h:12 +#| msgid "Which machine do you want to connect to?" +msgid "Which machine do you want to connect to?" +msgstr "କେଉଁ ଯନ୍ତ୍ର ସହିତ ଆପଣ ସଂଯୁକ୍ତ ହେବା ପାଇଁ ଚାହୁଁଛନ୍ତି?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "ସର୍ବଦା ଟ୍ୟାବଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ (_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 -#| msgid "Authentication failed" +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "ବୈଧିକରଣ କରନ୍ତୁ (_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "ସମ୍ପୂର୍ଣ୍ଣ ପରଦା (_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "ଆଧାର (_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "ନାମ(_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "ପ୍ରବେଶ ସଙ୍କେତ(_P):" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "ପ୍ରୋଟକଲ (_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "ଏହି ପ୍ରମାଣ ପତ୍ରକୁ ମନେରଖନ୍ତୁ (_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "ପରିମାପ (_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "ତାଲିକା ସଂକ୍ଷିପ୍ତ ପଥଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ (_S)" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "ଚାଳକ ନାମ(_U):" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "କେବଳ ଦର୍ଶନୀୟ (_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "ସକ୍ରିୟ ପ୍ଲଗ-ଇନ" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "ଆଧାର କିମ୍ବା ଆଧାର:ପ୍ରଦର୍ଶନ କିମ୍ବା ଆଧାର::ସଂଯୋଗିକୀ" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"ସକ୍ରିୟ ପ୍ଲଗଇନଗୁଡ଼ିକର ତାଲିକା। ଏହା ସକ୍ରିୟ ପ୍ଳଗଇନଗୁଡ଼ିକର \"Location\" ଧାରଣ କରିଥାଏ। " +"ପ୍ରଦତ୍ତ ପ୍ଲଗଇନର ଗୋଟିଏ \"Location\" ଧାରଣ କରିବା ପାଇଁ .vinagre-plugin " +"ଫାଇଲକୁ ଦେଖନ୍ତୁ।" -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "ସଂଳାପ ସଂଯୋଗରେ ସର୍ବାଧିକ ସଂଖ୍ୟକ ଇତିହାସ ବସ୍ତୁ" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -159,7 +172,7 @@ "ସେଟକରନ୍ତୁ. ଲକ୍ଷ୍ୟକରନ୍ତୁ ଯେ ଯଦି ସେମାନେ ସକ୍ରିୟ ଅଛନ୍ତି, ତେବେ ସେହି କି ଗୁଡ଼ିକ ତାଲିକା ଦ୍ୱାରା " "ବନ୍ଦକରାଯିବ ଏବଂ ସୁଦୂର ଆଧାର ପାଖକୁ ପଠାଯିବ ନାହିଁ." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -167,15 +180,15 @@ "ସବୁ ସମୟରେ ଟେବ ଗୁଡିକୁ ଦେଖାଇବା ପାଇଁ \"true୍ୟ\" ସେଟ କରନ୍.ୁ। falseମିଥ୍ୟା\" ସେଟ କରିବା " "ଦ୍ୱାରାକେବଳ ଏକରୁ ଅଧିକ ସଂଯୋଗ ଥିବା ସମୟରେହିଁ ଦେଖାଇଥାଏ।" -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "ଆଧାର ଡ୍ରପଡାଉନ ଭରଣରେ ସର୍ବାଧିକ ସଂଖ୍ୟକ ବସ୍ତୁ ଉଲ୍ଲେଖ କରନ୍ତୁ." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" ୟୁ.ଆର.ଏଲସ ପାଇଁ ଚାଳକ" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -185,10 +198,18 @@ "ଛାଡିଦେବା ପାଇଁ ଗ୍ରାହକ ପରିସେବକ କୁ କହିପାରନ୍ତି। ଡେସ୍କଟପ କୁ ଅନ୍ୟ ଗ୍ରାହକ ମାନଙ୍କ ସହିତ ସହଭାଗୀ କରିବା " "ପାଇଁ ଏହାର ମୂଲ୍ୟ true ସେଟ କରନ୍ତୁ।" -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "ଅନ୍ୟ ଗ୍ରାହକ ମାନଙ୍କୁ ସଂଯୁକ୍ତ ଅବସ୍ଥାରେ ଆମର ଛାଡିଯିବାଟା ଉଚିତ କି ନୁହଁ" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "କେବଳ ଗୋଟିଏ ସକ୍ରିୟ ସଂଯୋଗ ଥିବା ସମୟରେ ଆମର ଟେବ ଗୁଡିକୁ ଦେଖାଇବା ଉଚିତ କି ନୁହ" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "ଆମର ତାଲିକା ତ୍ୱରକଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ଉଚିତ କି (ସଂକ୍ଷିପ୍ତ ପଥ କିଗୁଡ଼ିକ)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "ସୁଦୂର ଡେସ୍କଟପ (VNC) ଫାଇଲ" @@ -197,531 +218,757 @@ msgid "Remote Desktop Connection" msgstr "ସୁଦୂର ଡେସ୍କଟପ ସଂଯୋଗ" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux ଟର୍ମିନାଲଗୁଡ଼ିକୁ ଅଭିଗମ୍ୟ କରନ୍ତୁ" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "ସଂଯୋଗିକୀ:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH ସମର୍ଥନ" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "'shared' ସୂଚକ ପାଇଁ ଖରାପ ମୂଲ୍ୟ: %d. ଏହା 0 କିମ୍ବା 1 ହୋଇଥିବା ଉଚିତ। ଏହାକୁ ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ।" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "ମାପିବା ଧାରାକୁ ସକ୍ରିୟ କରନ୍ତୁ" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC ବିକଳ୍ପଗୁଡ଼ିକ:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC ବିକଳ୍ପଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows ଏବଂ ଅନ୍ୟାନ୍ୟ ଯନ୍ତ୍ରଗୁଡ଼ିକରେ ଅଭିଗମ୍ୟ କରନ୍ତୁ।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "ଫାଇଲକୁ ବିଶ୍ଳେଷଣ କରିପାରିଲା ନାହିଁ।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "ଫାଇଲଟି ଗୋଟିଏ VNC ନୁହଁ: ସମୁହ \"ସଂଯୋଗ\" କୁ ହରାଇଛି।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "ଫାଇଲଟି ଗୋଟିଏ VNC ନୁହଁ: କି \"host\" କୁ ହରାଇଛି।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC ବିକଳ୍ପଗୁଡ଼ିକ" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "କେବଳ ଦର୍ଶନୀୟ (_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "ପରିମାପ (_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC ଫାଇଲଗୁଡ଼ିକ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "ଡେସ୍କଟପ ନାମ:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "ପରିସର:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "ହୋଷ୍ଟ ସହିତ ସଂଯୋଗରେ ତ୍ରୁଟି।" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +#| msgid "Authentication method to host %s is unsupported. (%u)" +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "ହୋଷ୍ଟ %s ର ବୈଧିକରଣ ପ୍ରକ୍ରିୟାଟି ସମର୍ଥିତ ନୁହଁ। (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "ବୈଧିକରଣ ପ୍ରକ୍ରିୟାଟି ସମର୍ଥିତ ନୁହଁ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "ବୈଧିକରଣ ତ୍ରୁଟି" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "ଏହି ଯନ୍ତ୍ରକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଗୋଟିଏ ଚାଳକ ନାମ ଆବଶ୍ୟକ।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "ଏହି ଯନ୍ତ୍ରକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଗୋଟିଏ ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "ପରିମାପ (_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "ସାମ୍ପ୍ରତିକ ୱିଣ୍ଡୋ ଆକାରରେ ସୂଦୁର ପରଦାକୁ ମେଳାନ୍ତୁ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "ମାଉସ ଏବଂ କିବୋର୍ଡ ଘଟଣାକୁ ପଠାଇନଥାଏ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "ପ୍ରକୃତ ଆକାର (_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "ସୁଦୂର ଡେସ୍କଟପର ଆକାର ସହିତ ଏହି ୱିଣ୍ଡୋକୁ ମେଳାନ୍ତୁ " + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del ପଠାନ୍ତୁ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "ସୁଦୂର ଯନ୍ତ୍ରକୁ Ctrl-Alt-Del ପଠାନ୍ତୁ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "ପରିମାପ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "କେବଳ ପଠନୀୟ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"ଅନୁମାପ ପରିବର୍ତ୍ତନ ଏହି ସ୍ଥାପନରେ ସମର୍ଥିତ ନୁହଁ।\n" +"\n" +"ଏହି ଫିଚରକୁ କେମିତି ସକ୍ରିୟ କରିବାକୁ ହେବ ଜାାଣିବ ପାଇଁା README ଫାଇଲ କୁ ପଢନ୍ତୁ(ଭିନାଗ୍ରେ ସହିତ ସିପ " +"ହୋଇଥିବା। " + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC ସମର୍ଥନ" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "ସୁଦୂର ଯନ୍ତ୍ର ସହିତ ତୁରନ୍ତ ଅଭିଗମ କରିବା ପାଇଁ ଗୋଟିଏ ତାଲିକା" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre Applet କାରଖାନା" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "vinagre ଚଲାଇପାରିଲା ନାହିଁ:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "ସୁଦୂର ଡେସ୍କଟପ ପ୍ରଦର୍ଶକକୁ ଖୋଲନ୍ତୁ" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "ଆପଣଙ୍କର ଚିହ୍ନିତସ୍ଥାନକୁ ଅଭିଗମନ କରନ୍ତୁ" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "ପ୍ରୋଟୋକଲ %s ଟି ସମର୍ଥିତ ନୁହଁ।" + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ପ୍ରାରମ୍ଭ କରିବାବା ସମୟରେ ତ୍ରୁଟି:%s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:275 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "ଅଜଣା ତ୍ରୁଟି" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ପ୍ରାରମ୍ଭ କରିବା ସମୟରେ ତ୍ରୁଟି: ଫାଇଲଟି ଖାଲିଥିବା ପରି ଲାଗୁଛି" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ପ୍ରାରମ୍ଭ କରିବାବା ସମୟରେ ତ୍ରୁଟି: ଫାଇଲଟି ଗୋଟିଏ vinagre ଚିହ୍ନିତ ଫାଇଲ ନୁହଁ" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ସଂରକ୍ଷଣ କରିବା ସମୟରେ ତ୍ରୁଟି: XML ଗଠନ ନିର୍ମାଣ କରିବାରେ ବିଫଳ" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ସଂରକ୍ଷଣ କରିବା ସମୟରେ ତ୍ରୁଟି: XML ଗଠନକୁ ଆରମ୍ଭ କରିବାରେ ବିଫଳ" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ସଂରକ୍ଷଣ କରିବା ସମୟରେ ତ୍ରୁଟି: XML ଗଠନକୁ ସିଦ୍ଧାନ୍ତ କରିବାରେ ବିଫଳ" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ସଂରକ୍ଷଣ କରିବା ସମୟରେ ତ୍ରୁଟି:%s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "ଚିହ୍ନିତ ସ୍ଥାନର ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରିବା ସମୟରେ ତ୍ରୁଟି: XML ଗଠନ ନିର୍ମାଣ କରିବାରେ ବିଫଳ" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "ଚିହ୍ନିତ ସ୍ଥାନର ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରିବା ସମୟରେ ତ୍ରୁଟି: XML ଗଠନକୁ ଆରମ୍ଭ କରିବାରେ ବିଫଳ" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "ଚିହ୍ନିତ ସ୍ଥାନର ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରିବା ସମୟରେ ତ୍ରୁଟି: XML ଗଠନକୁ ସିଦ୍ଧାନ୍ତ କରିବାରେ ବିଫଳ" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "ଚିହ୍ନିତ ସ୍ଥାନର ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରିବା ସମୟରେ ତ୍ରୁଟି:%s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +#| msgid "Error while migrating bookmarks: %s" +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "ଚିହ୍ନିତ ସ୍ଥାନର ସ୍ଥାନ ପରିବର୍ତ୍ତନ କରିବା ସମୟରେ ତ୍ରୁଟି: VNC ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରାଯାଇନାହିଁ" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "ଡିରେକ୍ଟୋରୀ ନିର୍ମାଣ କରିବାରେ ବିଫଳ" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." msgstr "ଚିହ୍ନିତ ଫାଇଲକୁ ଗୋଟିଏ ନୂତନ ଶୈଳୀରେ ନକଲ କରୁଅଛି। ଏହି ପ୍ରୟୋଗଟି କେବଳ ଥରେ ଚଲାଇବା ଉଚିତ।" -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "ପୁରୁଣା ଚିହ୍ନିତ ଫାଇଲକୁ ଖୋଲିବା ସମୟରେ ତ୍ରୁଟି:%s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "ସ୍ଥାନାନ୍ତରଣ ବାତିଲ ହୋଇଛି" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "ପୁରୁଣା ଚିହ୍ନିତ ଫାଇଲକୁ କଢାଯାଇପାରିଲା ନାହିଁ" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "ମୁଖ୍ୟ ଚାଳକ ଫୋଲଡ଼ର" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "ଏହି ଫୋଲଡ଼ର ପାଇଁ ଅବୈଧ ନାମ" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "କଣ ଆପଣ ସୁନିଶ୍ଚିତ କି ଆପଣ ଚିହ୍ନିତ ସ୍ଥାନରୁ %s କୁ ହଟାଇବାକୁ ଚାହୁଁଛନ୍ତି?" +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "ନାମ \"%s\" କୁ ଏହି ଫୋଲଡରରେ ପୂର୍ବରୁ ବ୍ୟବହାର କରାଯାଇଛି। ଦୟାକରି ଭିନ୍ନ ଏକ ନାମ ବ୍ୟବହାର କରନ୍ତୁ।" -#: ../src/vinagre-bookmarks-ui.c:241 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "ଏହି ବସ୍ତୁ ପାଇଁ ଅବୈଧ ନାମ" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(ପ୍ରୋଟକଲ: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +#| msgid "Are you sure you want to remove %s from bookmarks?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "କଣ ଆପଣ ସୁନିଶ୍ଚିତ କି ଆପଣ ଚିହ୍ନିତ ସ୍ଥାନରୁ %s କୁ ହଟାଇବାକୁ ଚାହୁଁଛନ୍ତି?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "ଫୋଲଡ଼ରକୁ କାଢ଼ିବେ କି?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "ଦେଖନ୍ତୁ ଯେ ଏହାର ସମସ୍ତ ଉପ ଫୋଲଡ଼ର ଏବଂ ବସ୍ତୁଗୁଡ଼ିକୁ ମଧ୍ଯ କଢ଼ାଯିବ।" -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "ବସ୍ତୁଗୁଡ଼ିକୁ କାଢ଼ିବେ କି?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ କାଢ଼ିବା ସମୟରେ ତ୍ରୁଟି: ଭରଣ ମିଳୁନାହିଁ" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "ନୂତନ ଫୋଲଡ଼ର" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "ଫାଇଲ କୁ ବାଛନ୍ତୁ" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1156 -msgid "Supported formats" -msgstr "ସମର୍ଥିତ ଶୈଳୀ" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "ସେଠାରେ କୌଣସି ସମର୍ଥିତ ଫାଇଲ ନାହିଁ" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"ସକ୍ରିୟ ପ୍ଲଗଇନଗୁଡ଼ିକ ମଧ୍ଯରୁ କୌଣସିଟି ସମର୍ଥିତ ଫାଇଲକୁ ଖୋଲିବା ପାଇଁ ଅନୁମତି ଦେଇନଥାଏ। କିଛି ପ୍ଲଗଇନକୁ " +"ସକ୍ରିୟ କରନ୍ତୁ ଏବଂ ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "ନିମ୍ନଲିଖିତ ଫାଇଲ କୁ ଖୋଲାଯାଇ ପାରିବ ନାହିଁ:" msgstr[1] "ନିମ୍ନଲିଖିତ ଫାଇଲ କୁ ଖୋଲାଯାଇ ପାରିବ ନାହିଁ:" -#: ../src/vinagre-connect.c:179 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "ପ୍ରୋଟକଲ ତାଲିକାରେ ସକ୍ରିୟ ପ୍ରୋଟକଲକୁ ପାଇଲା ନାହିଁ।" + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "ଇତିହାସ ଫାଇଲକୁ ସଂରକ୍ଷଣ କରିବା ସମୟରେ ତ୍ରୁଟି:%s" -#: ../src/vinagre-connect.c:191 -msgid "Choose a VNC Server" -msgstr "ଗୋଟିଏ VNC ସର୍ଭର ବାଛନ୍ତୁ" - -#: ../src/vinagre-connection.c:600 -#, c-format -msgid "The protocol %s is not supported." -msgstr "ପ୍ରୋଟୋକଲ %s ଟି ସମର୍ଥିତ ନୁହଁ।" +#: ../vinagre/vinagre-connect.c:340 +#| msgid "Open Remote Desktop Viewer" +msgid "Choose a Remote Desktop" +msgstr "ଗୋଟିଏ ସୁଦୂର ଡେସ୍କଟପ ବାଛନ୍ତୁ" -#: ../src/vinagre-connection.c:695 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "ଫାଇଲକୁ ଖୋଲିପାରିଲା ନାହିଁ।" -#: ../src/vinagre-connection.c:714 -msgid "Could not parse the file." -msgstr "ଫାଇଲକୁ ବିଶ୍ଳେଷଣ କରିପାରିଲା ନାହିଁ।" - -#: ../src/vinagre-connection.c:759 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "'shared' ସୂଚକ ପାଇଁ ଖରାପ ମୂଲ୍ୟ: %d. ଏହା 0 କିମ୍ବା 1 ହୋଇଥିବା ଉଚିତ। ଏହାକୁ ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ।" - -#: ../src/vinagre-connection.c:765 -msgid "Could not find the host address in the file." -msgstr "ଏହି ଫାଇଲରେ ଆଧାର ଠିକଣା ମିଳିଲା ନାହିଁ।" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "ଫାଇଲଟି କୌଣସି ପ୍ଳଗଇନଗୁଡ଼ିକ ଦ୍ୱାରା ଚିହ୍ନଟ ହୋଇନାହିଁ।" -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "ଅବୈଧ ପ୍ରୟୋଗ" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "drag&drop ପ୍ରୟୋଗରୁ ମିଳିଥିବା ତଥ୍ୟଟି ଅବୈଧ ଅଟେ।" -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "ପାଖରେ ଥିବା ହୋଷ୍ଟ ଗୁଡିକ" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "ଗୋଟିଏ .vnc ଫାଇଲ ଖୋଲେ" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "ଖୋଲା vinagre ସମ୍ପୂର୍ଣ୍ଣ ପରଦା ଧାରାରେ" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "ଫାଇଲ ନାମ" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "vinagreର ସ୍ଥିତବାନ ଦୃଷ୍ଟାନ୍ତରେ ଗୋଟିଏ ନୂତନ ଉଚ୍ଚସ୍ତରୀୟ ୱିଣ୍ଡୋ ନିର୍ମାଣକରନ୍ତୁ" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "vinagre ଦ୍ୱାରା ଚିହ୍ନଟ ଗୋଟିଏ ଫାଇଲକୁ ଖୋଲନ୍ତୁ" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "ଫାଇଲ ନାମ" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[ସର୍ଭର:ସଂଯୋଗିକୀ]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "ନିମ୍ନଲିଖିତ ତ୍ରୁଟି ଗୁଡିକ ଘଟିଯାଇଛି:" msgstr[1] "ନିମ୍ନଲିଖିତ ତ୍ରୁଟି ଗୁଡିକ ଘଟିଯାଇଛି:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "GNOME ପାଇଁ -VNC ଗ୍ରାହକ" +#: ../vinagre/vinagre-main.c:169 +#| msgid "Remote Desktop Viewer" +msgid "- Remote Desktop Viewer" +msgstr "- ସୁଦୂର ଡେସ୍କଟପ ପ୍ରଦର୍ଶକ" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "ଉପଲବ୍ଧ ନିର୍ଦ୍ଦେଶ ନାମା ବିକଳ୍ପ ଗୁଡିକର ସଂପୂର୍ଣ୍ଣ ତାଲିକା ଦେଖିବା ପାଇଁ 'ଭିନାଗ୍ରେ--ସାହାଯ୍ୟ' କୁ ଚଲାନ୍ତୁ" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "ଆଭାହି ହୋଷ୍ଟନାମକୁ ସମାଧାନ କରିବାରେ ବିଫଳ ହେଲା: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "ପ୍ଲଗଇନ %s ପୂର୍ବରୁ ସର୍ଭିସ %s ପାଇଁ ଗୋଟିଏ ବ୍ରାଉଜରକୁ ପଞ୍ଜିକୃତ କରିଛି।" + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to add mDNS browser for service %s." +msgstr "ସର୍ଭିସ %s ପାଇଁ mDNS ବ୍ରାଉଜରକୁ ଯୋଗ କରିବାରେ ବିଫଳ।" + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "ହୋଷ୍ଟ ଗୁଡିକୁ ଖୋଜିବୁଲିବାରେ ବିଫଳ ହେଲା: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS ବ୍ରାଉଜରକୁ ପ୍ରାରମ୍ଭ କରିବାରେ ବିଫଳ: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "ହୋଷ୍ଟ %s ସହିତ ସଂଯୋଗ ବନ୍ଦ ହୋଇଯାଇଛି।" +#| msgid "Connection to host %s was closed." +msgid "Connection to host %s was closed." +msgstr "ହୋଷ୍ଟ %s ସହିତ ସଂଯୋଗ ବନ୍ଦ ହୋଇଯାଇଛି।" -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "ସଂଯୋଗ ବନ୍ଦ ହୋଇଯାଇଛି" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +#| msgid "Authentication to host %s has failed" +msgid "Authentication to host %s has failed" +msgstr "ହୋଷ୍ଟ %s ର ବୈଧିକରଣ ବିଫଳ ହେଲା" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "ବୈଧିକରଣ ବିଫଳ ହେଲା" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "ସଂଯୋଗ କରୁଅଛି..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:882 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "ସଂଯୋଗ ବନ୍ଦ କରନ୍ତୁ" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "ପ୍ଲଗ-ଇନ ପରିଚାଳକ" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "ପ୍ଲଗ-ଇନ" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "ସକ୍ରିୟ" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "ବିନ୍ୟାସ କରନ୍ତୁ (_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "ସକ୍ରିୟ କରନ୍ତୁ (_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "ସମସ୍ତଙ୍କୁ ସକ୍ରିୟ କରନ୍ତୁ (_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "ସମସ୍ତଙ୍କୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ (_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +#| msgid "_About" +msgid "_About Plugin" +msgstr "ପ୍ଲଗ୍ଇନ୍ ବିଷୟରେ (_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "ପ୍ଲଗ୍ଇନ୍ ବିନ୍ଯାସ କରନ୍ତୁ (_o)" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "ପସନ୍ଦ ପରିଚାଳକକୁ ଆରମ୍ଭ କରାଯାଇପାରିବ ନାହିଁ।" -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "ହୋଷ୍ଟ ସହିତ ସଂଯୋଗରେ ତ୍ରୁଟି।" - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "ହୋଷ୍ଟ %s ର ବୈଧିକରଣ ବିଫଳ ହେଲା" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "ବୈଧିକରଣ ବିଫଳ ହେଲା" +#: ../vinagre/vinagre-tab.c:346 +#| msgid "_Full screen" +msgid "Leave fullscreen" +msgstr "ସମ୍ପୂର୍ଣ୍ଣ ପରଦା ତ୍ୟାଗ କରନ୍ତୁ" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "ହୋଷ୍ଟ %s ର ବୈଧିକରଣ ପ୍ରକ୍ରିୟାଟି ସମର୍ଥିତ ନୁହଁ। (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "ବୈଧିକରଣ ପ୍ରକ୍ରିୟାଟି ସମର୍ଥିତ ନୁହଁ" - -#: ../src/vinagre-tab.c:464 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "ସାମ୍ପ୍ରତିକ ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି।" -#: ../src/vinagre-tab.c:496 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "କି-ରିଙ୍ଗରେ ପ୍ରବେଶାନୁମତୀ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି।" -#: ../src/vinagre-tab.c:751 ../src/vinagre-tab.c:768 -#| msgid "Authentication failed" -msgid "Authentication error" -msgstr "ବୈଧିକରଣ ତ୍ରୁଟି" - -#: ../src/vinagre-tab.c:752 -msgid "A username is required in order to access this machine." -msgstr "ଏହି ଯନ୍ତ୍ରକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଗୋଟିଏ ଚାଳକ ନାମ ଆବଶ୍ୟକ।" - -#: ../src/vinagre-tab.c:769 -msgid "A password is required in order to access this machine." -msgstr "ଏହି ଯନ୍ତ୍ରକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଗୋଟିଏ ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ।" - -#: ../src/vinagre-tab.c:895 -msgid "Minimize window" -msgstr "ସର୍ବନିମ୍ନ ୱିଣ୍ଡୋ" - -#: ../src/vinagre-tab.c:910 ../src/vinagre-tab.c:911 -msgid "Scaling" -msgstr "ପରିମାପ" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "ସଂଯୋଗର ପରଦା ପ୍ରତିଛବି ପାଇଲା ନାହିଁ।" -#: ../src/vinagre-tab.c:920 ../src/vinagre-tab.c:921 -msgid "Read only" -msgstr "କେବଳ ପଠନୀୟ" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "ପରଦା ପ୍ରତିଛବି କୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" -#. Machine menu -#: ../src/vinagre-tab.c:931 ../src/vinagre-tab.c:932 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "ପରଦା ପ୍ରତିଛବି ନିଅନ୍ତୁ" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s ର ପରଦା ପ୍ରତିଛବି" -#: ../src/vinagre-tab.c:940 ../src/vinagre-tab.c:941 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del ପଠାନ୍ତୁ" +#: ../vinagre/vinagre-tab.c:881 +#| msgid "Error saving recent connection." +msgid "Error saving screenshot" +msgstr "ପରଦା ପ୍ରତିଛବିକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି" -#: ../src/vinagre-tab.c:1065 -msgid "Desktop Name:" -msgstr "ଡେସ୍କଟପ ନାମ:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +#| msgid "Failed to create the directory" +msgid "Impossible to get service property: %s" +msgstr "ସର୍ଭିସ ପାଇବା ଅସମ୍ଭବ: %s" -#: ../src/vinagre-tab.c:1067 -msgid "Port:" -msgstr "ସଂଯୋଗିକୀ:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +#| msgid "Failed to create the directory" +msgid "Impossible to create the connection: %s" +msgstr "ସଂଯୋଗ ନିର୍ମାଣ କରିବା ଅସମ୍ଭବ: %s" -#: ../src/vinagre-tab.c:1068 -msgid "Dimensions:" -msgstr "ପରିସର:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "ଧାରା ଟ୍ୟୁବକୁ ଗ୍ରହଣ କରିବା ଅସମ୍ଭବ: %s" -#: ../src/vinagre-tab.c:1134 -#| msgid "Take a screenshot of active connection" -msgid "Could not get a screenshot of the connection." -msgstr "ସଂଯୋଗର ପରଦା ପ୍ରତିଛବି ପାଇଲା ନାହିଁ।" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "ସମ୍ପର୍କ ନାମ ପାଇବା ଅସମ୍ଭବ: %s" -#: ../src/vinagre-tab.c:1142 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s ର ପରଦା ପ୍ରତିଛବି" +msgid "Impossible to get the avatar: %s" +msgstr "avatar ପାଇବା ଅସମ୍ଭବ: %s" -#: ../src/vinagre-tab.c:1145 -msgid "Save Screenshot" -msgstr "ପରଦା ପ୍ରତିଛବି କୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s ତାହାର ଡେସ୍କଟପକୁ ଆପଣଙ୍କ ସହିତ ସହଭାଗ କରିବାକୁ ଚାହୁଁଛନ୍ତି।" -#: ../src/vinagre-tab.c:1209 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"ଅନୁମାପ ପରିବର୍ତ୍ତନ ଏହି ସ୍ଥାପନରେ ସମର୍ଥିତ ନୁହଁ।\n" -"\n" -"ଏହି ଫିଚରକୁ କେମିତି ସକ୍ରିୟ କରିବାକୁ ହେବ ଜାାଣିବ ପାଇଁା README ଫାଇଲ କୁ ପଢନ୍ତୁ(ଭିନାଗ୍ରେ ସହିତ ସିପ " -"ହୋଇଥିବା। " +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "ଡେସ୍କଟପ ସହଭାଗୀ ଆମନ୍ତ୍ରଣ" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "ଯନ୍ତ୍ର(_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "ସମ୍ପାଦନ (_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "ଦୃଶ୍ୟ (_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "ଚିହ୍ନିତ ସ୍ଥାନଗୁଡିକ (_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "ସୁଦୂର ଯନ୍ତ୍ର ସହିତ ସଂଯୋଗ କରନ୍ତୁ" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "ଗୋଟିଏ .VNC ଫାଇଲ ଖୋଲନ୍ତୁ" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "କାରିକା କୁ ଛାଡି ଦିଅନ୍ତୁ" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "ପ୍ରୟୋଗ ପସନ୍ଦଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "ଚିହ୍ନିତ ସ୍ଥାନକୁ ଖୋଲନ୍ତୁ (_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "ଏହି ଯନ୍ତ୍ର ସହିତ ସଂଯୋଗ କରନ୍ତୁ" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "ଚିହ୍ନିତ ସ୍ଥାନଟିକୁ ସମ୍ପାଦନ କରନ୍ତୁ(_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "ବଚ୍ଛିତ ଚିହ୍ନିତ ସ୍ଥାନର ବିସ୍ତୃତ ବିବରଣୀ ଗୁଡିକୁ ସମ୍ପାଦନ କରନ୍ତୁ" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "ଚିହ୍ନିତ ସ୍ଥାନଗୁଡିକରୁ ହଟାଇ ନିଅନ୍ତୁ (_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "ସାମ୍ପ୍ରତିକ ବଚ୍ଛିତ ସଂଯୋଗ ଗୁଡିକୁ ଚିହ୍ନିତ ସ୍ଥାନରୁ ହଟାଇଦିଅନ୍ତୁ" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "ନୂତନ ଫୋଲଡ଼ର (_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "ଗୋଟିଏ ନୂତନ ଫୋଲଡ଼ର ନିର୍ମାଣ କରନ୍ତୁ" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "ସୂଚୀପତ୍ର (_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "ଭିନାଗ୍ରେ ସହାୟକ ପୁସ୍ତକ କୁ ଖୋଲନ୍ତୁ" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "ଏହି ପ୍ରୟୋଗ ସମ୍ପର୍କରେ" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "ସାଧନ ପଟି (_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "ସାଧନ ପଟିକୁ ଦେଖାନ୍ତୁ ଅବା ଲୁଚାନ୍ତୁ" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "ଅବସ୍ଥିତି ପଟି (_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "ଅବସ୍ଥିତି ପଟିକୁ ଦେଖାନ୍ତୁ ଅବା ଲୁଚାନ୍ତୁ" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "ପାର୍ଶ୍ୱ ଫଳକ(_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "ପାର୍ଶ୍ୱ ଫଳକକୁ ଦେଖାନ୍ତୁ ଅବା ଲୁଚାନ୍ତୁ" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "ସାମ୍ପ୍ରତିକ ସଂଯୋଗକୁ ବନ୍ଦ କରନ୍ତୁ" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "ସମସ୍ତଙ୍କୁ ବନ୍ଦ କରନ୍ତୁ (_C)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "ସମସ୍ତ ସକ୍ରିୟ ସଂଯୋଗ ଗୁଡିକୁ ବନ୍ଦ କରନ୍ତୁ" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "ଚିହ୍ନିତ ସ୍ଥାନରେ ଯୋଗ କରନ୍ତୁ (_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "ସାମ୍ପ୍ରତିକ ସଂଯୋଗକୁ ଚିହ୍ନିତ ସ୍ଥାନରେ ଯୋଗ କରନ୍ତୁ" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "ପରଦା ପ୍ରତିଛବି ନିଅନ୍ତୁ" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "ଗୋଟିଏ ସକ୍ରିୟ ସଂଯୋଗର ପରଦା ପ୍ରତିଛବି ନିଅନ୍ତୁ" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "ସକ୍ରିୟ ସଂଯୋଗକୁ Ctrl-Alt-Del ପଠାନ୍ତୁ" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "ସାମ୍ପ୍ରତିକ ଯନ୍ତ୍ରକୁ ସମ୍ପୂର୍ଣ୍ଣ ପରଦାରେ ଦେଖନ୍ତୁ" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "ପ୍ରକୃତ ଆକାର (_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "ସୁଦୂର ଡେସ୍କଟପର ଆକାର ସହିତ ଏହି ୱିଣ୍ଡୋକୁ ମେଳାନ୍ତୁ " - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "ପରିମାପ (_c)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "ସାମ୍ପ୍ରତିକ ୱିଣ୍ଡୋ ଆକାରରେ ସୂଦୁର ପରଦାକୁ ମେଳାନ୍ତୁ" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "କେବଳ ପଠନୀୟ (_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "ମାଉସ ଏବଂ କିବୋର୍ଡକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "ସାଧନ ପଟି (_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "ସାଧନ ପଟିକୁ ଦେଖାନ୍ତୁ ଅବା ଲୁଚାନ୍ତୁ" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "ଅବସ୍ଥିତି ପଟି (_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "ଅବସ୍ଥିତି ପଟିକୁ ଦେଖାନ୍ତୁ ଅବା ଲୁଚାନ୍ତୁ" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "ପାର୍ଶ୍ୱ ଫଳକ(_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "ପାର୍ଶ୍ୱ ଫଳକକୁ ଦେଖାନ୍ତୁ ଅବା ଲୁଚାନ୍ତୁ" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "ଗୋଟିଏ ତ୍ରୁଟି ଘଟିଯାଇଛି:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "ଭିନାଗ୍ରେ GNOME ଡେସ୍କଟପ ପାଇଁ ଗୋଟିଏ VNC ଗ୍ରାହକ" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +#| msgid "Could not open the file." +msgid "Could not load builder file: %s" +msgstr "ନିର୍ମାତା ଫାଇଲକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ: %s" + +#: ../vinagre/vinagre-utils.c:453 +#| msgid "Vinagre is a VNC client for the GNOME Desktop" +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre ଗୋଟିଏ GNOME ଡେସ୍କଟପ ପାଇଁ ଗୋଟିଏ ସୁଦୂର ଡେସ୍କଟପ ପ୍ରଦର୍ଶକ" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -732,7 +979,7 @@ "ଲାଇସେନ୍ସ ନିୟମାବଳୀ ଅନୁସାରେ ଆପଣ ଏହାକୁ ପୁନଃବଣ୍ଟନ କରିପାରିବେ ଏବଂ/ ଅଥବା ରୂପାନ୍ତର କରିପାରିବେ; " "ଲାଇସେନ୍ସର ସଂସ୍କରଣ ୨ ଅଥବା (ଆପଣଙ୍କ ବିକଳ୍ପ ଅନୁସାରେ) ଯେକୌଣସି ପରବର୍ତ୍ତୀ ସଂସ୍କରଣରେ।" -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -743,7 +990,7 @@ "କିମ୍ବା କୌଣସି ଏକ ଲଖ୍ୟ ପାଇଁ ସକ୍ଷମତା ର ସୂଚିତ ନିର୍ଭରୋକ୍ତି ବିନା ମଧ୍ଯ। ଅଧିକ ବିସ୍ତୃତ ବିବରଣୀ ପାଇଁ GNU " "ଜେନେରାଲ ପବ୍ଲିକ ଲାଇସେନ୍ସ ଦେଖନ୍ତୁ।" -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -751,30 +998,26 @@ "ଆପଣ ଏହି କାରିକା ସହିତ GNU ଜେନେରାଲ ପବ୍ଲିକ ଲାଇସେନ୍ସ ର ଗୋଟିଏ ନକଲ ଗ୍ରହଣ କରିଥିବା ଉଚିତ। ଯଦି ନୁହଁ, " "ତେବେ କୁ ଦେଖନ୍ତୁ।" -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "ଅନୁବାଦକ-ପ୍ରତିପତ୍ତି" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "ଭିନାଗ୍ରେ ୱେବସାଇଟ" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml ରେ ମିଶ୍ରଣ କରିପାରିଲା ନାହିଁ: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "ସାମ୍ପ୍ରତିକ ସଂଯୋଗ ଗୁଡିକ(_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s ଖୋଲନ୍ତୁ:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "ସୂଚକ କୁ ଛାଡିବା ପାଇଁ Ctrl+Alt ଦବାନ୍ତୁ" - diff -Nru vinagre-2.26.1/po/pa.po vinagre-2.29.1/po/pa.po --- vinagre-2.26.1/po/pa.po 2009-03-26 18:20:03.000000000 +0000 +++ vinagre-2.29.1/po/pa.po 2009-09-07 11:41:27.000000000 +0100 @@ -8,21 +8,21 @@ msgstr "" "Project-Id-Version: vinagre.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-20 20:31+0000\n" -"PO-Revision-Date: 2009-03-22 17:21+0000\n" +"POT-Creation-Date: 2009-09-01 06:12+0000\n" +"PO-Revision-Date: 2009-09-07 06:48+0530\n" "Last-Translator: A S Alam \n" -"Language-Team: Punjabi/Panjabi \n" +"Language-Team: Punjabi/Panjabi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 0.3\n" +"X-Generator: Lokalize 1.0\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "ਇਸ ਬਾਰੇ(_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "ਮੱਦਦ(_H)" @@ -31,123 +31,129 @@ msgstr "ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਅਸੈੱਸ" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਦਰਸ਼ਕ" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "ਕੁਨੈਕਸ਼ਨ ਚੋਣਾਂ" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "ਕੁਨੈਕਸ਼ਨ" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "ਫੋਲਡਰ" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "ਇੰਟਰਫੇਸ" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "ਚੋਣਾਂ" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "ਮੁੱਢਲਾ ਫੋਲਡਰ" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "ਕਿਸ ਮਸ਼ੀਨ ਨਾਲ ਤੁਸੀਂ ਕੁਨੈਕਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "ਸਭ ਉੱਤੇ ਦਿੱਤੇ ਖੇਤਰ ਲਾਜ਼ਮੀ ਹਨ" +#: ../data/vinagre.ui.h:1 +#| msgid "All fields above are mandatory" +msgid "All fields above are mandatory" +msgstr "ਸਭ ਉੱਤੇ ਦਿੱਤੇ ਖੇਤਰ ਲਾਜ਼ਮੀ ਹਨ" + +#: ../data/vinagre.ui.h:2 +#| msgid "Authentication is required" +msgid "Authentication is required" +msgstr "ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "ਬੁੱਕਮਾਰਕ" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +#| msgid "Connecting..." +msgid "Connection" +msgstr "ਕੁਨੈਕਸ਼ਨ" + +#: ../data/vinagre.ui.h:5 +#| msgid "Connection options" +msgid "Connection options" +msgstr "ਕੁਨੈਕਸ਼ਨ ਚੋਣਾਂ" + +#: ../data/vinagre.ui.h:6 +#| msgid "New Folder" +msgid "Folder" +msgstr "ਫੋਲਡਰ" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "ਹੋਸਟ:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +#| msgid "Interface" +msgid "Interface" +msgstr "ਇੰਟਰਫੇਸ" + +#: ../data/vinagre.ui.h:9 +#| msgid "Options" +msgid "Options" +msgstr "ਚੋਣਾਂ" + +#: ../data/vinagre.ui.h:10 +#| msgid "Parent Folder" +msgid "Parent Folder" +msgstr "ਮੁੱਢਲਾ ਫੋਲਡਰ" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "ਪਸੰਦ" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "ਕੀ ਅਸੀਂ ਟੈਬਾਂ ਵੇਖਾਈਏ ਭਾਵੇਂ ਜਦੋਂ ਕਿ ਕੇਵਲ ਇੱਕ ਹੀ ਕੁਨੈਕਸ਼ਨ ਐਕਟਿਵ ਹੋਵੇ" +#: ../data/vinagre.ui.h:12 +#| msgid "Which machine do you want to connect to?" +msgid "Which machine do you want to connect to?" +msgstr "ਕਿਸ ਮਸ਼ੀਨ ਨਾਲ ਤੁਸੀਂ ਕੁਨੈਕਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "ਕੀ ਅਸੀਂ ਮੇਨੂ ਐਕਸਰਲੇਟਰ ਵੇਖਾਈਏ (ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ)" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "ਹਮੇਸ਼ਾ ਟੈਬਾਂ ਵੇਖੋ(_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "ਪਰਮਾਣਕਿਤਾ(_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "ਪੂਰੀ ਸਕਰੀਨ(_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "ਹੋਸਟ(_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "ਨਾਂ(_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "ਪਾਸਵਰਡ(_P):." -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "ਪਰੋਟੋਕਾਲ(_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "ਇਹ ਸਨਦ ਯਾਦ ਰੱਖੋ(_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "ਸਕੇਲਿੰਗ(_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "ਮੇਨੂ ਸ਼ਾਰਟਕੱਟ ਵੇਖੋ(_S)" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "ਕੇਵਲ ਵੇਖੋ(_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "ਐਕਟਿਵ ਪਲੱਗਇਨ" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "host ਜਾਂ host:display ਜਾਂ host::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"ਐਕਟਿਵ ਪਲੱਗਇਨ ਦੀ ਲਿਸਟ ਹੈ। ਇਹ ਐਕਟਿਵ ਪਲੱਗਇਨ ਦਾ \"ਟਿਕਾਣਾ\" ਰੱਖਦੀ ਹੈ। " +"ਦਿੱਤੀ ਪਲੱਗਇਨ ਦਾ ਟਿਕਾਣਾ ਲੈਣ ਲਈ .vinagre-plugin ਫਾਇਲ ਵੇਖੋ।" -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "ਕੁਨੈਕਟ ਡਾਈਲਾਗ ਵਿੱਚ ਅਤੀਤ ਆਈਟਮਾਂ ਦੀ ਵੱਧੋ-ਵੱਧ ਗਿਣਤੀ" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -157,7 +163,7 @@ "ਯਾਦ ਰੱਖੋ ਕਿ ਜੇ ਉਹ ਚਾਲੂ ਹੋਏ ਤਾਂ ਉਹ ਸਵਿੱਚਾਂ ਨੂੰ ਮੇਨੂ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ ਅਤੇ ਰਿਮੋਟ ਹੋਸਟ ਲਈ ਨਹੀਂ " "ਭੇਜੀਆਂ ਜਾਣਗੀਆਂ।" -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -165,15 +171,15 @@ "ਹਮੇਸ਼ਾ ਟੈਬ ਵੇਖਣ ਲਈ \"true\" ਸੈੱਟ ਕਰੋ। ਜੇ ਟੈਬਾਂ ਕੇਵਲ ਤਾਂ ਹੀ ਵੇਖਣੀਆਂ ਹਨ, ਜੇ ਇੱਕ ਤੋਂ ਵੱਧ ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ " "ਹੋਣ ਤਾਂ \"false\" ਸੈੱਟ ਕਰੋ।" -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "ਹੋਸਟ ਲਕਟਵਾਂ ਇੰਦਰਾਜ਼ ਵਿੱਚ ਵੱਧੋ-ਵੱਧ ਆਈਟਮਾਂ ਦੀ ਗਿਣਤੀ ਦਿਓ।" -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" URL ਲਈ ਹੈਂਡਲਰ" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -183,10 +189,18 @@ "ਮੌਜੂਦਾ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋ ਜਾਣ। ਇਹ ਮੁੱਲ ਨੂੰ ਸਹੀਂ ਕਰੋ, ਜੇ ਤੁਸੀਂ ਹੋਰ ਕਲਾਇਟਾਂ ਨਾਲ ਡੈਸਕਟਾਪ ਸਾਂਝਾ ਕਰਨਾ " "ਚਾਹੁੰਦੇ ਹੋ।" -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "ਕੀ ਹੋਰ ਕਲਾਈਟਾਂ ਨੂੰ ਕੁਨੈਕਟ ਹੀ ਰਹਿਣ ਦੇਈਏ" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "ਕੀ ਅਸੀਂ ਟੈਬਾਂ ਵੇਖਾਈਏ ਭਾਵੇਂ ਜਦੋਂ ਕਿ ਕੇਵਲ ਇੱਕ ਹੀ ਕੁਨੈਕਸ਼ਨ ਐਕਟਿਵ ਹੋਵੇ" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "ਕੀ ਅਸੀਂ ਮੇਨੂ ਐਕਸਰਲੇਟਰ ਵੇਖਾਈਏ (ਸ਼ਾਰਟਕੱਟ ਕੁੰਜੀਆਂ)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "ਰਿਮੋਟ ਡੈਸਕਟਾਪ (VNC) ਫਾਇਲ" @@ -195,539 +209,747 @@ msgid "Remote Desktop Connection" msgstr "ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਕੁਨੈਕਸ਼ਨ" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "ਯੂਨੈਕਸ/ਲੀਨਕਸ ਟਰਮੀਨਲ ਵਰਤੋਂ" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "ਪੋਰਟ:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH ਸਹਿਯੋਗ" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "'shared' ਨਿਸ਼ਾਨ ਲਈ ਗਲਤ ਮੁੱਲ: %d। ਇਸ ਲਈ 0 ਜਾਂ 1 ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ। ਇਹ ਅਣਡਿੱਠਾ ਕੀਤਾ।" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "ਸਕੇਲ ਮੋਡ ਵਰਤੋਂ" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC ਚੋਣਾਂ:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC ਚੋਣਾਂ ਵੇਖੋ" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "ਯੂਨੈਕਸ/ਲੀਨਕਸ, ਵਿੰਡੋਜ਼ ਅਤੇ ਹੋਰ ਮਸ਼ੀਨਾਂ ਵਰਤੋਂ" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "ਫਾਇਲ ਪਾਰਸ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "ਫਾਇਲ VNC ਨਹੀਂ ਹੈ: ਗਰੁੱਪ \"ਕੁਨੈਕਸ਼ਨ (connection)\" ਮੌਜੂਦ ਨਹੀਂ।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "ਫਾਇਲ VNC ਨਹੀਂ ਹੈ: ਗਰੁੱਪ \"ਹੋਸਟ (host)\" ਮੌਜੂਦ ਨਹੀਂ।" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC ਚੋਣਾਂ" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "ਕੇਵਲ ਵੇਖੋ(_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "ਸਕੇਲਿੰਗ(_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC ਫਾਇਲਾਂ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "ਡੈਸਕਟਾਪ ਨਾਂ:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "ਮਾਪ:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306, c-format +#| msgid "Authentication method to host %s is unsupported. (%u)" +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "ਹੋਸਟ %s ਲਈ ਪਰਮਾਣਕਿਤਾ ਢੰਗ ਗ਼ੈਰ-ਸਹਾਇਕ ਹੈ। (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "ਪਰਮਾਣਕਿਤਾ ਗ਼ੈਰ-ਸਹਾਇਕ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "ਪਰਮਾਣਕਿਤਾ ਗਲਤੀ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "ਇਸ ਮਸ਼ੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵਾਸਤੇ ਇੱਕ ਯੂਜ਼ਰ ਨਾਂ ਚਾਹੀਦਾ ਹੈ।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "ਇਸ ਮਸ਼ੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵਾਸਤੇ ਇੱਕ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ।" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "ਸਕੇਲਿੰਗ(_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "ਰਿਮੋਟ ਸਕਰੀਨ ਨੂੰ ਮੌਜੂਦਾ ਵਿੰਡੋ ਦੇ ਆਕਾਰ ਵਿੱਚ ਫਿੱਟ ਕਰੋ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "ਮਾਊਂਸ ਅਤੇ ਕੀਬੋਰਡ ਈਵੈਂਟ ਨਾ ਭੇਜੋ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "ਅਸਲੀ ਆਕਾਰ(_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "ਵਿੰਡੋ ਨੂੰ ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਦੇ ਸਾਈਜ਼ ਮੁਤਾਬਕ ਅਡਜੱਸਟ ਕਰੋ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del ਭੇਜੋ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "ਰਿਮੋਟ ਮਸ਼ੀਨ ਨੂੰ Ctrl+Alt+Del ਭੇਜੋ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "ਸਕੇਲਿੰਗ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"ਇਸ ਇੰਸਟਾਲੇਸ਼ਨ ਵਿੱਚ ਸਕੇਲਿੰਗ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।\n" +"\n" +"ਇਹ ਫੀਚਰ ਚਾਲੂ ਕਰਨ ਵਾਸਤੇ README ਫਾਇਲ (ਵੀਨਾਗਰੇ ਨਾਲ ਮਿਲਦੀ ਹੈ) ਨੂੰ ਪੜ੍ਹੋ।" + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC ਸਹਿਯੋਗ" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "ਰਿਮੋਟ ਮਸ਼ੀਨ ਨਾਲ ਛੇਤੀ ਨਾਲ ਕੁਨੈਕਟ ਵਾਸਤੇ ਮੇਨੂ" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "ਵੀਨਾਗਰੇ ਐਪਲਿਟ ਫੈਕਟਰੀ" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "ਵੀਨਾਗਰੇ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਦਰਸ਼ਕ ਖੋਲ੍ਹੋ" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "ਆਪਣੇ ਬੁੱਕਮਾਰਕ ਵਰਤੋਂ" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "ਪਰੋਟੋਕਾਲ %s ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।" + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "ਬੁੱਕਮਾਰਕ ਸ਼ੁਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "ਅਣਜਾਣ ਗਲਤੀ" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "ਬੁੱਕਮਾਰਕ ਸ਼ੁਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: ਫਾਇਲ ਖਾਲੀ ਜਾਪਦੀ ਹੈ।" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "ਬੁੱਕਮਾਰਕ ਸ਼ੁਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: ਫਾਇਲ ਇੱਕ ਵੀਨਾਗਰੇ ਬੁੱਕਮਾਰਕ ਫਾਇਲ ਨਹੀਂ ਹੈ" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "ਬੁੱਕਮਾਰਕ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ: XML ਢਾਂਚਾ ਫਾਇਲ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "ਬੁੱਕਮਾਰਕ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ: XML ਢਾਂਚਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "ਬੁੱਕਮਾਰਕ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ: XML ਢਾਂਚਾ ਮੁਕੰਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "ਬੁੱਕਮਾਰਕ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "ਬੁੱਕਮਾਰਕ ਪਰਵਾਸ ਲਈ ਦੌਰਾਨ ਗਲਤੀ: XML ਢਾਂਚਾ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "ਬੁੱਕਮਾਰਕ ਪਰਵਾਸ ਦੌਰਾਨ ਗਲਤੀ: XML ਢਾਂਚਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "ਬੁੱਕਮਾਰਕ ਪਰਵਾਸ ਦੌਰਾਨ ਗਲਤੀ: XML ਢਾਂਚਾ ਮੁਕੰਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "ਬੁੱਕਮਾਰਕ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +#| msgid "Error while migrating bookmarks: %s" +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "ਬੁੱਕਮਾਰਕ ਮਾਈਗਰੇਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ। VNC ਪਲੱਗਇਨ ਐਕਟੀਵੇਟ ਨਹੀਂ ਹੈ" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." msgstr "ਬੁੱਕਮਾਰਕ ਫਾਇਲ ਨਵੇਂ ਫਾਰਮੈਟ ਵਿੱਚ ਪਰਵਾਸ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਇਹ ਓਪਰੇਸ਼ਨ ਕੇਵਲ ਇੱਕ ਵਾਰ ਹੀ ਸਹਾਇਕ ਹੈ।" -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "ਬੁੱਕਮਾਰਕ ਫਾਇਲ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "ਪਰਵਾਸ ਰੱਦ ਕੀਤਾ" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "ਪੁਰਾਣੀ ਬੁੱਕਮਾਰਕ ਫਾਇਲ ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "ਰੂਟ ਫੋਲਡਰ" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "ਇਹ ਫੋਲਡਰ ਲਈ ਗਲਤ ਨਾਂ" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "The name \"%s\" is already used in this folder. Please use a different name." msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ \"%s\" ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰਾ ਨਾਂ ਚੁਣੋ ਜੀ।" -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 -#| msgid "Invalid name for this folder" +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "ਇਸ ਆਈਟਮ ਲਈ ਅਢੁੱਕਵਾਂ ਨਾਂ" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "ਕੀ ਤੁਸੀਂ %s ਨੂੰ ਬੁੱਕਮਾਰਕਾਂ ਵਿੱਚੋਂ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" +msgid "(Protocol: %s)" +msgstr "(ਪਰੋਟੋਕਾਲ: %s)" -#: ../src/vinagre-bookmarks-ui.c:297 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308, c-format +#| msgid "Are you sure you want to remove %s from bookmarks?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "ਕੀ ਤੁਸੀਂ %s ਨੂੰ ਬੁੱਕਮਾਰਕਾਂ ਵਿੱਚੋਂ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "ਫੋਲਡਰ ਹਟਾਉਣਾ ਹੈ?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "ਸਭ ਅੰਦਰੂਨੀ ਫੋਲਡਰ ਅਤੇ ਆਈਟਮਾਂ ਨੂੰ ਵੀ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇ।" -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "ਆਈਟਮ ਹਟਾਉਣੀ ਹੈ?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "ਬੁੱਕਮਾਰਕ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ: ਐਂਟਰੀ ਨਹੀਂ ਲੱਭੀ" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "ਨਵਾਂ ਫੋਲਡਰ" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "ਫਾਇਲ ਚੁਣੋ" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "ਸਹਾਇਕ ਫਾਰਮੈਟ" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "ਕੋਈ ਵੀ ਸਹਾਇਕ ਫਾਇਲਾਂ ਨਹੀਂ ਹਨ" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"ਕੋਈ ਐਕਟਿਵ ਪਲੱਗਇਨ ਖੁੱਲ੍ਹੀ ਫਾਇਲ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ। ਕੁਝ ਹੋਰ ਪਲੱਗਇਨ ਐਕਟਿਵ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ " +"ਕਰੋ।" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "ਅੱਗੇ ਦਿੱਤੀ ਫਾਇਲ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ:" msgstr[1] "ਅੱਗੇ ਦਿੱਤੀਆਂ ਫਾਇਲਾਂ ਖੋਲ੍ਹੀਆਂ ਨਹੀਂ ਜਾ ਸਕੀਆਂ:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "ਪਰੋਟੋਕਾਲ ਲਿਸਟ ਵਿੱਚ ਐਕਟਿਵ ਪਰੋਟੋਕਾਲ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।" + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "ਅਤੀਤ ਫਾਇਲ ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "ਇੱਕ VNC ਸਰਵਰ ਚੁਣੋ" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "ਪਰੋਟੋਕਾਲ %s ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।" +#: ../vinagre/vinagre-connect.c:340 +#| msgid "Open Remote Desktop Viewer" +msgid "Choose a Remote Desktop" +msgstr "ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਚੁਣੋ" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "ਫਾਇਲ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ।" -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "ਫਾਇਲ ਪਾਰਸ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।" - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "'shared' ਨਿਸ਼ਾਨ ਲਈ ਗਲਤ ਮੁੱਲ: %d। ਇਸ ਲਈ 0 ਜਾਂ 1 ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ। ਇਹ ਅਣਡਿੱਠਾ ਕੀਤਾ।" - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "ਫਾਇਲ ਵਿੱਚ ਹੋਸਟ ਐਡਰੈੱਸ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "ਫਾਇਲ ਕਿਸੇ ਵੀ ਪਲੱਗਇਨ ਵਲੋਂ ਪਛਾਣੀ ਨਹੀਂ ਗਈ।" -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "ਅਢੁੱਕਵਾਂ ਓਪਰੇਸ਼ਨ" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "ਚੁੱਕਣ ਅਤੇ ਸੁੱਟਣ ਓਪਰੇਸ਼ਨ ਤੋਂ ਮਿਲਿਆ ਡਾਟਾ ਅਢੁੱਕਵਾਂ ਹੈ।" -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "ਨੇੜਲੇ ਹੋਸਟ" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr ".vnc ਫਾਇਲ ਖੋਲ੍ਹੋ" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "ਵੀਨਾਗਰੇ ਨੂੰ ਪੂਰੀ ਸਕਰੀਨ ਮੋਡ ਵਿੱਚ ਖੋਲ੍ਹੋ" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "ਫਾਇਲ-ਨਾਂ" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "ਵੀਨਾਗਰੇ ਦੇ ਇੱਕ ਮੌਜੂਦ ਮੌਕੇ ਵਿੱਚ ਇੱਕ ਨਵੀਂ ਉੱਚ-ਪੱਧਰੀ ਵਿੰਡੋ ਬਣਾਓ" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "ਵੀਨਾਗਰੇ ਵਲੋਂ ਪਛਾਣੀ ਫਾਇਲ ਖੋਲ੍ਹੋ" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "ਫਾਇਲ-ਨਾਂ" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਹੈ:" msgstr[1] "ਅੱਗੇ ਦਿੱਤੀਆਂ ਗਲਤੀਆਂ ਆਈਆਂ ਹਨ:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- ਗਨੋਮ ਲਈ VNC ਕਲਾਇਟ" +#: ../vinagre/vinagre-main.c:169 +#| msgid "Remote Desktop Viewer" +msgid "- Remote Desktop Viewer" +msgstr "- ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਦਰਸ਼ਕ" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "ਪੂਰੀਆਂ ਉਪਲੱਬਧ ਕਮਾਂਡ ਲਾਈਨ ਚੋਣਾਂ ਵੇਖਣ ਲਈ 'vinagre --help' ਵੇਖੋ" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "ਅਵੀ ਹੋਸਟ-ਨਾਂ ਹੱਲ਼ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "ਪਲੱਗਇਨ %s ਪਹਿਲਾਂ ਹੀ ਸਰਵਿਸ %s ਲਈ ਬਰਾਊਜ਼ਰ ਨਾਲ ਰਜਿਸਟਰ ਹੈ।" + +#: ../vinagre/vinagre-mdns.c:209, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to add mDNS browser for service %s." +msgstr "ਸਰਵਿਸ %s ਲਈ mDNS ਬਰਾਊਜ਼ਰ ਨਾਲ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "ਹੋਸਟ ਲਈ ਝਲਕ ਵੇਖਣ ਲਈ ਫੇਲ੍ਹ: %s\n" -#: ../src/vinagre-notebook.c:168 -#, c-format -msgid "Connection to host %s was closed." -msgstr "ਹੋਸਟ %s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ।" +#: ../vinagre/vinagre-mdns.c:298, c-format +#| msgid "Failed to browse for hosts: %s\n" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS ਬਰਾਊਜ਼ਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461, c-format +#| msgid "Connection to host %s was closed." +msgid "Connection to host %s was closed." +msgstr "ਹੋਸਟ %s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ।" -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482, c-format +#| msgid "Authentication to host %s has failed" +msgid "Authentication to host %s has failed" +msgstr "ਹੋਸਟ %s ਲਈ ਪਰਮਾਣਿਕਤਾ ਲਈ ਫੇਲ੍ਹ ਹੈ" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "ਪਲੱਗਇਨ ਮੈਨੇਜਰ" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "ਪਲੱਗਇਨ" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "ਚਾਲੂ" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "ਸੰਰਚਨਾ(_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "ਐਕਟੀਵੇਟ(_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "ਸਭ ਐਕਟੀਵੇਟ(_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "ਸਭ ਡੀ-ਐਕਟੀਵੇਟ(_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +#| msgid "_About" +msgid "_About Plugin" +msgstr "ਪਲੱਗਇਨ ਬਾਰੇ(_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "ਪਲੱਗਇਨ ਸੰਰਚਨਾ(_o)" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "ਪਸੰਦ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।" -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।" - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "ਹੋਸਟ %s ਲਈ ਪਰਮਾਣਿਕਤਾ ਲਈ ਫੇਲ੍ਹ ਹੈ" +#: ../vinagre/vinagre-tab.c:346 +#| msgid "_Full screen" +msgid "Leave fullscreen" +msgstr "ਪੂਰੀ ਸਕਰੀਨ ਛੱਡੋ" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੋਈ" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "ਹੋਸਟ %s ਲਈ ਪਰਮਾਣਕਿਤਾ ਢੰਗ ਗ਼ੈਰ-ਸਹਾਇਕ ਹੈ। (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "ਪਰਮਾਣਕਿਤਾ ਗ਼ੈਰ-ਸਹਾਇਕ" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "ਤਾਜ਼ਾ ਕੁਨੈਕਸ਼ਨ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ" -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "ਕੀਰਿੰਗ ਵਿੱਚ ਸਨਦ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।" -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "ਪਰਮਾਣਕਿਤਾ ਗਲਤੀ" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "ਇਸ ਮਸ਼ੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵਾਸਤੇ ਇੱਕ ਯੂਜ਼ਰ ਨਾਂ ਚਾਹੀਦਾ ਹੈ।" - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "ਇਸ ਮਸ਼ੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵਾਸਤੇ ਇੱਕ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ।" - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "ਵਿੰਡੋ ਘੱਟੋ-ਘੱਟ" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "ਕੁਨੈਕਸ਼ਨ ਥਈ ਸਕਰੀਨ-ਸ਼ਾਟ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।" -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "ਸਕੇਲਿੰਗ" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਸੰਭਾਲੋ" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s ਦਾ ਸਕਰੀਨਸ਼ਾਟ" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "ਸਕਰੀਨਸ਼ਾਟ ਲਵੋ" +#: ../vinagre/vinagre-tab.c:881 +#| msgid "Error saving recent connection." +msgid "Error saving screenshot" +msgstr "ਸਕਰੀਨਸ਼ਾਟ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del ਭੇਜੋ" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "ਸਰਵਿਸ ਵਿਸ਼ੇਸ਼ਤਾ ਲੈਣੀ ਅਸੰਭਵ: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "ਡੈਸਕਟਾਪ ਨਾਂ:" +#: ../vinagre/vinagre-tube-handler.c:286, c-format +#| msgid "Failed to create the directory" +msgid "Impossible to create the connection: %s" +msgstr "%s: ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਅਸੰਭਵ" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "ਪੋਰਟ:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "%s: ਸਟਰੀਮ ਟਿਊਬ ਮਨਜ਼ੂਰ ਕਰਨੀ ਅਸੰਭਵ" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "ਮਾਪ:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "%s: ਸੰਪਰਕ ਨਾਂ ਲੈਣਾ ਅਸੰਭਵ" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "ਕੁਨੈਕਸ਼ਨ ਥਈ ਸਕਰੀਨ-ਸ਼ਾਟ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।" +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "%s: ਅਵਤਾਰ ਲੈਣਾ ਅਸੰਭਵ" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "%s ਦਾ ਸਕਰੀਨਸ਼ਾਟ" +msgid "%s wants to share his desktop with you." +msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਆਪਣਾ ਡੈਸਕਟਾਪ ਸਾਂਝਾ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ।" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਸੰਭਾਲੋ" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"ਇਸ ਇੰਸਟਾਲੇਸ਼ਨ ਵਿੱਚ ਸਕੇਲਿੰਗ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।\n" -"\n" -"ਇਹ ਫੀਚਰ ਚਾਲੂ ਕਰਨ ਵਾਸਤੇ README ਫਾਇਲ (ਵੀਨਾਗਰੇ ਨਾਲ ਮਿਲਦੀ ਹੈ) ਨੂੰ ਪੜ੍ਹੋ।" +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "ਡੈਸਕਟਾਪ ਸਾਂਝ ਸੱਦਾ" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "ਮਸ਼ੀਨ(_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "ਸੋਧ(_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "ਵੇਖੋ(_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "ਬੁੱਕਮਾਰਕ(_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "ਇੱਕ ਰਿਮੋਟ ਮਸ਼ੀਨ ਨਾਲ ਕੁਨੈਕਟ" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "ਇੱਕ .VNC ਫਾਇਲ ਖੋਲ੍ਹੋ" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "ਪਰੋਗਰਾਮ ਬੰਦ ਕਰੋ" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "ਐਪਲੀਕੇਸ਼ਨ ਪਸੰਦ ਸੋਧੋ" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "ਬੁੱਕਮਾਰਕ ਖੋਲ੍ਹੋ(_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "ਇਸ ਮਸ਼ੀਨ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "ਬੁੱਕਮਾਰਕ ਸੋਧ(_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "ਚੁਣੇ ਬੁੱਕਮਾਰਕ ਲਈ ਵੇਰਵੇ ਲਈ ਸੋਧੋ" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "ਬੁੱਕਮਾਰਕ ਤੋਂ ਹਟਾਓ(_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "ਮੌਜੂਦਾ ਚੁਣਿਆ ਕੁਨੈਕਸ਼ਨ ਬੁੱਕਮਾਰਕ ਵਿੱਚੋਂ ਹਟਾਓ" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "ਨਵਾਂ ਫੋਲਡਰ(_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "ਇੱਕ ਨਵਾਂ ਫੋਲਡਰ ਬਣਾਓ" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "ਸਮੱਗਰੀ(_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "ਵੀਨਾਗਰੇ ਮੇਨੂਅਲ ਖੋਲ੍ਹੋ" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "ਇਸ ਐਪਲੀਕੇਸ਼ਨ ਬਾਰੇ" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "ਟੂਲਬਾਰ(_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "ਟੂਲਬਾਰ ਵੇਖੋ ਜਾਂ ਓਹਲੇ ਕਰੋ" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "ਹਾਲਤ-ਬਾਰ(_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "ਹਾਲਤ-ਬਾਰ ਵੇਖੋ ਜਾਂ ਓਹਲੇ" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "ਬਾਹੀ(_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "ਬਾਹੀ ਵੇਖੋ ਜਾਂ ਓਹਲੇ ਕਰੋ" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "ਮੌਜੂਦਾ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕਰੋ" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "ਸਭ ਬੰਦ ਕਰੋ(_l)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "ਸਭ ਐਕਟਿਵ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕਰੋ" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "ਬੁੱਕਮਾਰਕ 'ਚ ਸ਼ਾਮਲ(_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "ਮੌਜੂਦਾ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਆਪਣੇ ਬੁੱਕਮਾਰਕ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "ਸਕਰੀਨਸ਼ਾਟ ਲਵੋ" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "ਐਕਟਿਵ ਕੁਨੈਕਸ਼ਨ ਦਾ ਸਕੀਰਨਸ਼ਾਟ ਲਵੋ" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "ਸਰਗਰਮ ਕੁਨੈਕਸ਼ਨ ਨੂੰ Ctrl+Alt+Del ਭੇਜੋ" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "ਪੂਰੀ ਸਕਰੀਨ ਵਿੱਚ ਮੌਜੂਦਾ ਮਸ਼ੀਨ ਵੇਖੋ" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "ਅਸਲੀ ਆਕਾਰ(_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "ਵਿੰਡੋ ਨੂੰ ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਦੇ ਸਾਈਜ਼ ਮੁਤਾਬਕ ਅਡਜੱਸਟ ਕਰੋ" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "ਸਕੇਲਿੰਗ(_c)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "ਰਿਮੋਟ ਸਕਰੀਨ ਨੂੰ ਮੌਜੂਦਾ ਵਿੰਡੋ ਦੇ ਆਕਾਰ ਵਿੱਚ ਫਿੱਟ ਕਰੋ" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ(_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "ਮਾਊਂਸ ਅਤੇ ਕੀਬੋਰਡ ਬੰਦ ਕਰੋ" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "ਟੂਲਬਾਰ(_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "ਟੂਲਬਾਰ ਵੇਖੋ ਜਾਂ ਓਹਲੇ ਕਰੋ" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "ਹਾਲਤ-ਬਾਰ(_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "ਹਾਲਤ-ਬਾਰ ਵੇਖੋ ਜਾਂ ਓਹਲੇ" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "ਬਾਹੀ(_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "ਬਾਹੀ ਵੇਖੋ ਜਾਂ ਓਹਲੇ ਕਰੋ" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਹੈ:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "ਵੀਨਾਗਰੇ ਗਨੋਮ ਡੈਸਕਟਾਪ ਲਈ VNC ਕਲਾਇਟ ਹੈ" +#: ../vinagre/vinagre-utils.c:150, c-format +#| msgid "Could not open the file." +msgid "Could not load builder file: %s" +msgstr "%s: ਬਿਲਡਰ ਫਾਇਲ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" + +#: ../vinagre/vinagre-utils.c:453 +#| msgid "Vinagre is a VNC client for the GNOME Desktop" +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "ਵੀਨਾਗਰੇ ਗਨੋਮ ਡੈਸਕਟਾਪ ਲਈ ਰਿਮੋਟ ਡੈਸਕਟਾਪ ਦਰਸ਼ਕ ਹੈ" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -738,7 +960,7 @@ "ਫਾਊਨਡੇਸ਼ਨ ਨੇ ਤਿਆਰ ਕੀਤਾ ਹੈ, ਦੇ ਵਰਜਨ ੨ ਜਾਂ ਨਵੇਂ ਦੀਆਂ ਸ਼ਰਤਾਂ (ਉਹ ਤੁਹਾਡੀ ਆਪਣੀ ਮਰਜ਼ੀ ਹੈ) ਅਧੀਨ " "ਵੰਡ ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ" -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -749,7 +971,7 @@ "ਜਾ ਰਹੀ ਹੈ, ਕਿਸੇ ਖਾਸ ਕੰਮ ਲਈ ਅਨੁਕੂਲ ਹੋਣ ਜਾਂ ਠੀਕ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਨ ਦੀ ਵੀ ਕੋਈ ਗਾਰੰਟੀ ਨਹੀਂ ਹੈ। ਹੋਰ " "ਵੇਰਵੇ ਲਈ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।" -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -757,32 +979,60 @@ "ਤੁਸੀਂ ਗਨੂ ਜਰਨਲ ਪਬਲਿਕ ਲਾਈਸੈਂਸ ਦੀ ਕਾਪੀ ਇਸ ਪਰੋਗਰਾਮ ਨਾਲ ਲੈ ਸਕਦੇ ਹੋ। ਜੇ ਨਹੀਂ ਤਾਂ ਵੇਖੋ।" -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ ੨੦੦੬, ੨੦੦੭, ੨੦੦੯\n" "P(unjabi) O(pen) S(ource) T(eam)" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "ਵੀਨਾਗਰੇ ਵੈੱਬਸਾਈਟ" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml ਪਰਵਾਸ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "ਤਾਜ਼ਾ ਕੁਨੈਕਸ਼ਨ(_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s ਖੁੱਲ੍ਹੇ:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "ਕਰਸਰ ਛੱਡਣ ਵਾਸਤੇ Ctrl+Alt ਦੱਬੋ" +#~ msgid "Connection" +#~ msgstr "ਕੁਨੈਕਸ਼ਨ" + +#~ msgid "Folder" +#~ msgstr "ਫੋਲਡਰ" + +#~ msgid "host or host:display or host::port" +#~ msgstr "host ਜਾਂ host:display ਜਾਂ host::port" + +#~ msgid "Supported formats" +#~ msgstr "ਸਹਾਇਕ ਫਾਰਮੈਟ" + +#~ msgid "Choose a VNC Server" +#~ msgstr "ਇੱਕ VNC ਸਰਵਰ ਚੁਣੋ" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "ਫਾਇਲ ਵਿੱਚ ਹੋਸਟ ਐਡਰੈੱਸ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।" + +#~ msgid "Opens a .vnc file" +#~ msgstr ".vnc ਫਾਇਲ ਖੋਲ੍ਹੋ" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- ਗਨੋਮ ਲਈ VNC ਕਲਾਇਟ" + +#~ msgid "Minimize window" +#~ msgstr "ਵਿੰਡੋ ਘੱਟੋ-ਘੱਟ" + +#~ msgid "_Read only" +#~ msgstr "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ(_R)" +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "ਕਰਸਰ ਛੱਡਣ ਵਾਸਤੇ Ctrl+Alt ਦੱਬੋ" diff -Nru vinagre-2.26.1/po/pl.po vinagre-2.29.1/po/pl.po --- vinagre-2.26.1/po/pl.po 2009-03-02 14:54:56.000000000 +0000 +++ vinagre-2.29.1/po/pl.po 2009-08-30 12:14:28.000000000 +0100 @@ -1,8 +1,3 @@ -# Polish translation of vinagre. -# Copyright (C) 2007, 2008, 2009 Aviary.pl -# This file is distributed under the same license as the vinagre package. -# Tomasz Dominikowski , 2007, 2008, 2009 -# # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- # Aviary.pl # Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz @@ -13,23 +8,23 @@ msgstr "" "Project-Id-Version: vinagre\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-01 19:45+0100\n" -"PO-Revision-Date: 2009-03-01 19:16+0100\n" +"POT-Creation-Date: 2009-08-29 16:41+0200\n" +"PO-Revision-Date: 2009-08-29 16:39+0100\n" "Last-Translator: Tomasz Dominikowski \n" -"Language-Team: Aviary.pl \n" +"Language-Team: Polish \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" "X-Poedit-Language: Polish\n" "X-Poedit-Country: Poland\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_O programie" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "Pomo_c" @@ -38,126 +33,120 @@ msgstr "Dostęp do zdalnych pulpitów" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Przeglądarka zdalnych pulpitów" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Wymagane uwierzytelnienie" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Opcje połączenia" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Połączenie" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Katalog" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interfejs" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Opcje" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Katalog nadrzędny" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Z którym komputerem się połączyć?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Wszystkie powyższe pola są obowiązkowe" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Wszystkie powyższe pola są obowiązkowe" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Wymagane uwierzytelnienie" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Zakładki" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Połączenie" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Opcje połączenia" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Katalog" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Komputer:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interfejs" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Opcje" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Katalog nadrzędny" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Preferencje" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Określa, czy wyświetlać karty nawet w przypadku tylko jednego aktywnego " -"połączenia" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Określa, czy wyświetlać skróty klawiszowe w menu" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Z którym komputerem się połączyć?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Stałe wyświetlanie kart" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Uwierzytelnij" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Pełny ekran" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Komputer:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nazwa:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Hasło:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokół:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Zapamiętanie danych logowania" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Skalowanie" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Wyświetlanie skrótów menu" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Nazwa użytkownika:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Tylko podgląd" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Włączone wtyczki" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "komputer lub komputer:ekran lub komputer::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Lista włączonych wtyczek. Zawiera \"Położenia\" włączonych wtyczek. W pliku ." +"vinagre-plugin można odnaleźć \"Położenie\" danej wtyczki." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Maksymalna liczba elementów historii w oknie dialogowym połączenia" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -167,7 +156,7 @@ "zwrócić uwagę, iż gdy są włączone, te klawisze będą przechwytywane przez " "menu i nie będą przesyłane do zdalnego komputera." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -175,15 +164,15 @@ "Wartość \"true\" włącza stałe wyświetlanie kart. Wartość \"false\" włącza " "wyświetlanie kart jeśli występuje więcej niż jedno aktywne połączenie." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." -msgstr "Określa maksymalną liczbę elementów w rozwijalnym menu komputerów." +msgstr "Określa maksymalną liczbę elementów w menu komputerów." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Obsługa adresów URL \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -194,10 +183,21 @@ "połączenia. Ustawienie wartości na \"true\" spowoduje możliwość " "współdzielenia pulpitu z innymi klientami." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Określa, czy inne klienty mogą nadal być połączone" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Określa, czy wyświetlać karty nawet w przypadku tylko jednego aktywnego " +"połączenia" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Określa, czy wyświetlać skróty klawiszowe w menu" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Plik zdalnego pulpitu (VNC)" @@ -206,234 +206,437 @@ msgid "Remote Desktop Connection" msgstr "Połączenie ze zdalnym pulpitem" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Dostęp do terminali Unix/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Obsługa SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Błędna wartość dla flagi \"shared\": %d. Powinna być 0 lub 1. Ignorowanie." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Tryb skalowany" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Opcje VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Wyświetla opcje VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Dostęp do komputerów z systemami Unix/Linux oraz Windows." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Nie można przetworzyć pliku." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "To nie jest plik VNC: Brak grupy \"connection\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "To nie jest plik VNC: Brak klucza \"host\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Opcje VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Tylko podgląd" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Skalowanie" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Pliki VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nazwa pulpitu:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Wymiary:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Błąd podczas łączenia z komputerem." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Metoda uwierzytelniania w komputerze %s jest nieobsługiwana. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Metoda uwierzytelniania jest nieobsługiwana" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Błąd uwierzytelniania" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Aby uzyskać dostęp do tego komputera wymagana jest nazwa użytkownika." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Aby uzyskać dostęp do tego komputera wymagane jest hasło." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "S_kalowanie" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Dopasowuje zdalny ekran do bieżącego rozmiaru okna" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Nie przesyła zdarzeń myszy i klawiatury" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Rozmiar pierwotny" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Dopasowuje okno do rozmiarów zdalnego pulpitu" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Wyślij Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Wysyła Ctrl+Alt+Del do zdalnego komputera" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Skalowanie" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Tylko do odczytu" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Skalowanie nie jest obsługiwane przez tę instalację.\n" +"\n" +"Proszę przeczytać plik README (dostarczony z programem Vinagre), aby " +"dowiedzieć się jak włączyć tę funkcję." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Obsługa VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Menu szybkiego dostępu do zdalnych komputerów" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Generator apletów Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" -msgstr "Nie można uruchomić vinagre:" +msgstr "Nie można uruchomić programu vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Otwórz przeglądarkę zdalnych pulpitów" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Dostęp do zakładek" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokół %s nie jest obsługiwany." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Błąd podczas inicjowania zakładek: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Nieznany błąd" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Błąd podczas inicjowania zakładek: plik wydaje się być pusty" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Błąd podczas inicjowania zakładek: Plik nie jest plikiem zakładek programu " "vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "" "Błąd podczas zapisywania zakładek: Nie udało się utworzyć struktury XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "" "Błąd podczas zapisywania zakładek: Nie udało się zainicjować struktury XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "" "Błąd podczas zapisywania zakładek: Nie udało się sfinalizować struktury XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Błąd podczas zapisywania zakładek: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "Wystąpił błąd podczas przenoszenia zakładek: Nie udało się utworzyć " "struktury XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Wystąpił błąd podczas przenoszenia zakładek: Nie udało się zainicjować " "struktury XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Wystąpił błąd podczas przenoszenia zakładek: Nie udało się sfinalizować " "struktury XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Błąd podczas przenoszenia zakładek: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Błąd podczas przenoszenia zakładek: wtyczka VNC jest wyłączona" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Nie udało się utworzyć katalogu" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." msgstr "" -"Migrowanie pliku zakładek do nowego formatu. Operacja ma odbyć się tylko " +"Migrowanie pliku zakładek do nowego formatu. Działanie ma odbyć się tylko " "jednokrotnie." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Błąd podczas otwierania poprzedniego pliku zakładek: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migracja anulowana" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Nie można usunąć poprzedniego pliku zakładek" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Katalog główny" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Niepoprawna nazwa dla tego katalogu" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "" +"Nazwa \"%s\" jest już używana w tym katalogu. Proszę wybrać inną nazwę." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "Nieprawidłowa nazwa dla tego elementu" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokół: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Na pewno usunąć %s z zakładek?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Na pewno usunąć %s z zakładek?" -#: ../src/vinagre-bookmarks-ui.c:241 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Usunąć katalog?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "" "Proszę zwrócić uwagę, iż wszystkie jego podkatalogi znajdujące się w nich " "elementy także zostaną usunięte." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Usunąć element?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" -msgstr "Błąd podczas usuwania zakładki: wpis nieodnaleziony" +msgstr "Błąd podczas usuwania zakładki: Wpis nieodnaleziony" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Nowy katalog" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Wybór pliku" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Obsługiwane formaty" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Brak obsługiwanych plików" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Żadna z włączonych wtyczek nie obsługuje otwierania obsługiwanego pliku. " +"Proszę włączyć wtyczki i spróbować ponownie. " + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Następujący plik nie mógł zostać otwarty:" msgstr[1] "Następujące pliki nie mogły zostać otwarte:" msgstr[2] "Następujące pliki nie mogły zostać otwarte:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Nie można uzyskać aktywnego protokołu na liście protokołów." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Błąd podczas zapisywania pliku historii: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Proszę wybrać serwer VNC" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Wybór zdalnego pulpitu" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokół %s nie jest obsługiwany." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Nie można otworzyć pliku." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Nie można przetworzyć pliku." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Plik nie został rozpoznany przez żadną z wtyczek." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Błędna wartość dla flagi \"shared\": %d. Powinna być 0 lub 1. Ignorowanie." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Nie można odnaleźć adresu hosta w pliku." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" -msgstr "Niepoprawna operacja" +msgstr "Niepoprawne działanie" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." -msgstr "Dane otrzymane z operacji \"przeciągnij i upuść\" są niepoprawne." +msgstr "Dane otrzymane z działania \"przeciągnij i upuść\" są niepoprawne." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Komputery w pobliżu" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Otwiera plik .vnc" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Otwiera program vinagre w trybie pełnego ekranu" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "nazwa_pliku" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Tworzy nowe okno najwyższego poziomu w istniejącej instancji vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Otwiera plik rozpoznany przez program vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "nazwa_pliku" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[serwer:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Wystąpił następujący błąd:" @@ -441,341 +644,353 @@ msgstr[2] "Wystąpiły następujące błędy:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- klient VNC dla środowiska GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Przeglądarka zdalnych pulpitów" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Uruchomienie \"vinagre --help\" wyświetli pełną listę dostępnych poleceń" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" -msgstr "Nieudane uzyskanie nazwy komputera przez avahi: %s\n" +msgstr "Nieudane uzyskanie nazwy komputera przez program avahi: %s\n" + +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Wtyczka %s już zarejestrowała przeglądarkę usługi %s." -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Nieudane dodanie przeglądarki mDNS dla usługi %s." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Nieudane przeglądanie w poszukiwaniu komputerów: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -msgid "Connection to host %s was closed." -msgstr "Połączenie z komputerem %s zostało zamknięte." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Nieudane zainicjowanie przeglądarki mDNS: %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "Połączenie z komputerem %s zostało zamknięte." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Połączenie zostało zamknięte" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Uwierzytelnienie w komputerze %s nie powiodło się" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Uwierzytelnienie nie powiodło się" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Łączenie..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Zamknij połączenie" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Menedżer wtyczek" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Wtyczka" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Włączona" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Skonfiguruj" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Włącz" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Włącz ws_zystkie" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "Wyłącz wszys_tkie" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_O wtyczce" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "S_konfiguruj wtyczkę" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Nie można zainicjować menedżera preferencji." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Błąd podczas łączenia z komputerem." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Uwierzytelnienie w komputerze %s nie powiodło się" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Uwierzytelnienie nie powiodło się" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "" -"Metoda uwierzytelniania w komputerze %s jest nieobsługiwana. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Metoda uwierzytelniania jest nieobsługiwana" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Opuść pełny ekran" -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Błąd podczas zapisywania ostatniego połączenia." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Błąd podczas zapisywania uwierzytelnień w bazie kluczy." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Błąd uwierzytelniania" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Aby uzyskać dostęp do tego komputera wymagana jest nazwa użytkownika." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Aby uzyskać dostęp do tego komputera wymagane jest hasło." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimalizuje okno" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Nie udało się uzyskać zrzutu ekranu połączenia." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Skalowanie" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Zapisz zrzut ekranu" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Tylko do odczytu" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Zrzut ekranu %s" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Pobierz zrzut ekranu" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Błąd podczas zapisywania zrzutu ekranu" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Wyślij Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Niemożliwe uzyskanie własności usługi: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Nazwa pulpitu:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Nie udało się utworzyć połączenia: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Niemożliwa akceptacja strumienia: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Wymiary:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Niemożliwe uzyskanie nazwy kontaktu: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Nie udało się uzyskać zrzutu ekranu połączenia." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Niemożliwe uzyskanie awataru: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "Zrzut ekranu %s" +msgid "%s wants to share his desktop with you." +msgstr "Użytkownik %s chce współdzielić swój pulpit." -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Zapisz zrzut ekranu" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Skalowanie nie jest obsługiwane przez tę instalację.\n" -"\n" -"Proszę przeczytać plik README (dostarczony z Vinagre), aby dowiedzieć się " -"jak włączyć tę funkcję." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Zaproszenie do współdzielenia pulpitu" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Komputer" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Edycja" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Widok" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Zakładki" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Połączenie ze zdalnym komputerem" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Otwórz plik .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Kończy pracę programu" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Modyfikuje preferencje programu" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Otwórz zakładkę" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Łączy z tym komputerem" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" -msgstr "_Modyfikuj zakładkę" +msgstr "Z_modyfikuj zakładkę" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Modyfikuje szczegóły zaznaczonej zakładki" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Usuń z zakładek" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Usuwa bieżąco zaznaczone połączenie z zakładek" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Nowy katalog" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Tworzy nowy katalog" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Zawartość" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" -msgstr "Otwiera podręcznik systemowy Vinagre" +msgstr "Otwiera podręcznik użytkownika programu Vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "O tym programie" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Pasek _narzędziowy" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Wyświetla lub ukrywa pasek narzędziowy" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Pasek stanu" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Wyświetla lub ukrywa pasek stanu" + +# skrócone w Totem, tu też +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "P_anel" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Wyświetla lub ukrywa panel boczny" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Zamyka bieżące połączenie" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Zamknij wszystkie" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Zamyka wszystkie aktywne połączenia" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "Dod_aj do zakładek" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Dodaje bieżące połączenie do zakładek" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Pobierz zrzut ekranu" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Pobiera zrzut ekranu aktywnego połączenia" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Wysyła Ctrl+Alt+Del do aktywnego połączenia" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Wyświetla bieżącą sesję na pełnym ekranie" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Rozmiar pierwotny" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Dopasowuje okno do rozmiarów zdalnego pulpitu" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "S_kalowanie" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Dopasowuje zdalny ekran do bieżących wymiarów okna" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Tylko do odczytu" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Wyłącza mysz i klawiaturę" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Pasek _narzędziowy" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Wyświetla lub ukrywa pasek narzędziowy" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Pasek stanu" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Wyświetla lub ukrywa pasek stanu" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "P_anel" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Wyświetla lub ukrywa panel zakładek" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Wystąpił błąd:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Program Vinagre jest klientem VNC dla środowiska GNOME" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Nie można wczytać pliku builder: %s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "" +"Program Vinagre jest przeglądarką zdalnych pulpitów dla środowiska GNOME" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 "" -"Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej i/" +"Program Vinagre jest wolnym oprogramowaniem; można go rozprowadzać dalej i/" "lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej " "przez Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji " "lub którejś z późniejszych wersji." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre 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 "" -"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - " +"Program Vinagre rozpowszechniany jest z nadzieją, iż będzie on użyteczny - " "jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI " "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -784,87 +999,33 @@ "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie " "- proszę odwiedzić stronę internetową ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Aviary.pl , 2007, 2008, 2009\n" "Tomasz Dominikowski , 2007, 2008, 2009" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Witryna programu Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Nie można scalić pliku vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Ostatnie połączenia" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Otwiera %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Naciśnięcie CTRL+ALT uwolni kursor" - -#~ msgid "Editing a bookmark" -#~ msgstr "Modyfikowanie zakładki" - -#~ msgid "Enter a name for this connection" -#~ msgstr "Proszę wprowadzić nazwę dla tego połączenia" - -#~ msgid "" -#~ "In order to connect on this machine, a password is required. Please " -#~ "supply it." -#~ msgstr "" -#~ "Aby połączyć się z tym komputerem wymagane jest hasło. Proszę je " -#~ "wprowadzić." - -#~ msgid "Editing a bookmark" -#~ msgstr "Modyfikowanie zakładki" - -#~ msgid "Saving to bookmarks" -#~ msgstr "Zapisywanie do zakładek" - -#~ msgid "_Bookmark name:" -#~ msgstr "Nazwa _zakładki:" - -#~ msgid "Error: %s" -#~ msgstr "Błąd: %s" - -#~ msgid "Confirm removal?" -#~ msgstr "Na pewno usunąć?" - -#~ msgid "Error while removing %s from bookmarks: %s" -#~ msgstr "Błąd podczas usuwania %s z zakładek: %s" - -#~ msgid "" -#~ "Scaling does not work properly on composited windows. Disable the visual " -#~ "effects and try again." -#~ msgstr "" -#~ "Skalowanie nie współpracuje z efektami graficznymi. Proszę je wyłączyć i " -#~ "spróbować ponownie." - -#~ msgid "_Port:" -#~ msgstr "_Port:" - -#~ msgid "Image" -#~ msgstr "Obraz" - -#~ msgid "Name" -#~ msgstr "Nazwa" - -#~ msgid "Hide bookmarks" -#~ msgstr "Ukryj zakładki" - -#~ msgid "Expected `%s' got `%s' for key %s" -#~ msgstr "Oczekiwano \"%s\", otrzymano \"%s\" dla klucza %s" +#~ msgid "Failed to request name: %s" +#~ msgstr "Nieudane uzyskanie nazwy: %s" -#~ msgid "Press Ctrl+Alt to grab the cursor" -#~ msgstr "Naciśnięcie CTRL+ALT chwyci kursor" +#~ msgid "No error given" +#~ msgstr "Brak komunikatu błędu" diff -Nru vinagre-2.26.1/po/POTFILES.in vinagre-2.29.1/po/POTFILES.in --- vinagre-2.26.1/po/POTFILES.in 2008-12-11 17:38:01.000000000 +0000 +++ vinagre-2.29.1/po/POTFILES.in 2009-10-26 13:42:25.000000000 +0000 @@ -3,26 +3,40 @@ data/GNOME_VinagreApplet.xml data/vinagre.desktop.in.in data/vinagre-file.desktop.in.in -data/vinagre.glade -data/vinagre.schemas.in +[type: gettext/glade]data/vinagre.ui +data/vinagre.schemas.in.in data/vinagre-mime.xml.in data/vinagre-ui.xml -src/GNOME_VinagreApplet.server.in.in -src/vinagre-app.c -src/vinagre-applet.c -src/vinagre-bookmarks.c -src/vinagre-bookmarks-migration.c -src/vinagre-bookmarks-tree.c -src/vinagre-bookmarks-ui.c -src/vinagre-commands.c -src/vinagre-connect.c -src/vinagre-connection.c -src/vinagre-fav.c -src/vinagre-main.c -src/vinagre-mdns.c -src/vinagre-notebook.c -src/vinagre-prefs.c -src/vinagre-tab.c -src/vinagre-ui.h -src/vinagre-utils.c -src/vinagre-window.c +plugins/ssh/vinagre-ssh-connection.c +plugins/ssh/vinagre-ssh-plugin.c +plugins/ssh/vinagre-ssh-tab.c +plugins/ssh/ssh.vinagre-plugin.desktop.in +plugins/vnc/vinagre-vnc-connection.c +plugins/vnc/vinagre-vnc-plugin.c +plugins/vnc/vinagre-vnc-tab.c +plugins/vnc/vnc.vinagre-plugin.desktop.in +plugins/vnc/vinagre-vnc-listener-dialog.c +plugins/vnc/vinagre-vnc-listener.c +[type: gettext/glade]plugins/vnc/vnc.ui +vinagre/GNOME_VinagreApplet.server.in.in +vinagre/vinagre-app.c +vinagre/vinagre-applet.c +vinagre/vinagre-bookmarks.c +vinagre/vinagre-bookmarks-migration.c +vinagre/vinagre-bookmarks-tree.c +vinagre/vinagre-bookmarks-ui.c +vinagre/vinagre-commands.c +vinagre/vinagre-connect.c +vinagre/vinagre-connection.c +vinagre/vinagre-fav.c +vinagre/vinagre-main.c +vinagre/vinagre-mdns.c +vinagre/vinagre-notebook.c +vinagre/vinagre-plugin-dialog.c +vinagre/vinagre-plugin-manager.c +vinagre/vinagre-prefs.c +vinagre/vinagre-tab.c +vinagre/vinagre-tube-handler.c +vinagre/vinagre-ui.h +vinagre/vinagre-utils.c +vinagre/vinagre-window.c diff -Nru vinagre-2.26.1/po/POTFILES.skip vinagre-2.29.1/po/POTFILES.skip --- vinagre-2.26.1/po/POTFILES.skip 2008-06-16 17:10:56.000000000 +0100 +++ vinagre-2.29.1/po/POTFILES.skip 2009-07-28 16:01:24.000000000 +0100 @@ -1,4 +1,7 @@ data/vinagre.desktop.in data/vinagre-file.desktop.in data/vinagre-mime.xml.in -src/GNOME_VinagreApplet.server.in +data/vinagre.schemas.in +plugins/dummy/dummy.vinagre-plugin.desktop.in +plugins/dummy/vinagre-dummy-plugin.c +vinagre/GNOME_VinagreApplet.server.in diff -Nru vinagre-2.26.1/po/pt_BR.po vinagre-2.29.1/po/pt_BR.po --- vinagre-2.26.1/po/pt_BR.po 2009-03-20 23:35:32.000000000 +0000 +++ vinagre-2.29.1/po/pt_BR.po 2009-10-26 13:41:48.000000000 +0000 @@ -1,17 +1,20 @@ # Português/Brasil translation of vinagre. # Copyright (C) 2007 Jonh Wendell # This file is distributed under the same license as the vinagre package. -# Jonh Wendell , 2007, 2009. +# Jonh Wendell , 2007-2009. # Vladimir Melo , 2007, 2008. # Og Maciel , 2007. # Taylon Silmer , 2009. +# Krix Apolinário , 2009. +# Henrique P Machado , 2009. +# msgid "" msgstr "" "Project-Id-Version: vinagre 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-20 20:35-0300\n" -"PO-Revision-Date: 2009-03-20 20:35-0300\n" -"Last-Translator: Jonh Wendell \n" +"POT-Creation-Date: 2009-08-24 19:53-0300\n" +"PO-Revision-Date: 2009-08-24 18:30-0300\n" +"Last-Translator: Henrique P Machado \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,11 +23,11 @@ "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Sobre" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "Aj_uda" @@ -33,165 +36,171 @@ msgstr "Acesse áreas de trabalho remotas" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Visualizador de Área de Trabalho Remota" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "A autenticação é necessária" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Opções de conexão" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Conexão" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Pasta" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interface" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Opções" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Pasta pai" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "A qual máquina você quer conectar-se?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Todos os campos acima são obrigatórios" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Todos os campos acima são obrigatórios" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "A autenticação é necessária" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Marcadores" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Conexão" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Opções de conexão" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Pasta" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Máquina:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interface" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Opções" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Pasta pai" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Preferências" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Se as abas deverão ser mostradas mesmo quando existir apenas uma conexão " -"ativa" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Se os aceleradores de menu deverão ser mostrados (teclas de atalho)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "A qual máquina você quer conectar-se?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Sempre mostrar abas" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Autenticar" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Tela cheia" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Máquina:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nome:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Senha:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protocolo:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Lembrar esta credencial" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Escalonamento" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Mostrar atalhos do menu" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Nome de usuário:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Apenas visualização" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Plug-ins ativos" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "máquina ou máquina:tela ou máquina::porta" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Lista de plug-ins ativos. Ela contém a \"Localização\" dos plug-ins ativos. " +"Veja o arquivo .vinagre-plugin para obter a \"Localização\" de um " +"determinado plug-in." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Número máximo de itens de histórico no diálogo de conexão" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " "and will not be sent to the remote host." msgstr "" -"Define como \"false\" para desabilitar os atalhos de menu. Define como \"true" +"Defina como \"false\" para desabilitar os atalhos de menu. Defina como \"true" "\" para habilitá-los. Observe que se eles estão habilitados, aquelas teclas " "serão interceptadas pelo menu e não serão enviadas para a máquina remota." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." msgstr "" -"Define como \"true\" para sempre mostrar as abas. Define como \"false\" para " +"Defina como \"true\" para sempre mostrar as abas. Defina como \"false\" para " "mostrar apenas as abas quando existir mais que uma conexão ativa." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Especifica o número máximo de itens na lista desdobrável de máquinas." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" -msgstr "O manipulador de URLs \"vnc://\"" +msgstr "O manipulador para URLs \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " "to share the desktop with the other clients." msgstr "" "Quando conectar a uma máquina, o cliente pode dizer ao servidor para manter " -"outros clientes conectados ou abandonar as conexões existentes. Define o " -"valor para true para compartilhar a área de trabalho com outros clientes." +"outros clientes conectados ou abandonar as conexões existentes. Defina o " +"valor como \"true\" para compartilhar a área de trabalho com outros clientes." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Se outros clientes deverão ser mantidos conectados" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Se as abas deverão ser mostradas mesmo quando existir apenas uma conexão " +"ativa" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Se os aceleradores de menu deverão ser mostrados (teclas de atalho)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Arquivo de área de trabalho remota (VNC)" @@ -200,92 +209,272 @@ msgid "Remote Desktop Connection" msgstr "Conexão de área de trabalho remota" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Acesse terminais Unix/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Porta:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Suporte SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Valor incorreto para a flag \"shared\": %d. É esperado um valor 0 ou 1. " +"Ignorando-o." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Habilita o modo dimensionado" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Opções do VNC" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Exibir opções do VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Acesse máquinas Unix/Linux, Windows e outras." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Não foi possível analisar o arquivo." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "O arquivo não é um arquivo VNC: Faltando o grupo \"connection\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "O arquivo não é um arquivo VNC: Faltando a chave \"host\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Opções do VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Apenas visualização" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Escalonamento" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Arquivos VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nome da área de trabalho:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensões:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Erro ao conectar à máquina." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "O método de autenticação da máquina %s não é suportado. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Autenticação não suportada" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Erro de autenticação" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "É necessário um nome de usuário para acessar esta máquina." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "É necessária uma senha para acessar esta máquina." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "Es_calonamento" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Ajusta a tela remota dentro do tamanho da janela atual" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Não enviar eventos de mouse e teclado" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Tamanho _original" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Ajusta a janela para o tamanho da área de trabalho remota" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Enviar Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Envia Ctrl+Alt+Del para a máquina remota" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Escalonamento" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Apenas leitura" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Esta instalação não tem suporte a escalonamento.\n" +"\n" +"Leia o arquivo README (distribuído com o Vinagre) para saber como habilitar " +"este recurso." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Suporte VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Um menu para acessar rapidamente máquinas remotas" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" -msgstr "Fábrica de miniaplicativo do Vinagre" +msgstr "Fábrica de miniaplicativos do Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Não foi possível executar o vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Abrir o Visualizador de Área de Trabalho Remota" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Acesse os seus marcadores" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256 +#, c-format +msgid "The protocol %s is not supported." +msgstr "O protocolo %s não é suportado." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Erro ao inicializar marcadores: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Erro desconhecido" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Erro ao inicializar os marcadores: O arquivo parece estar vazio" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Erro ao inicializar os marcadores: O arquivo não é um arquivo de marcadores " "do vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Erro ao salvar os marcadores: Falha ao criar a estrutura XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Erro ao salvar os marcadores: Falha ao inicializar a estrutura XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Erro ao salvar os marcadores: Falha ao finalizar a estrutura XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Erro ao salvar os marcadores: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Erro ao migrar os marcadores: Falha ao criar a estrutura XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Erro ao migrar os marcadores: Falha ao inicializar a estrutura XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Erro ao migrar os marcadores: Falha ao finalizar a estrutura XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Erro ao migrar os marcadores: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Erro ao migrar os marcadores: o plug-in VNC não está ativado" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Falha ao criar o diretório" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -293,458 +482,489 @@ "Migrando o arquivo de marcadores para o novo formato. Esta operação só deve " "ser executada uma vez." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Erro ao abrir o arquivo de marcadores antigo: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migração cancelada" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Não foi possível remover o arquivo de marcadores antigo" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Pasta raiz" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Nome inválido para esta pasta" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." msgstr "O nome \"%s\" já é usado nesta pasta. Por favor use um nome diferente." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Nome inválido para este item" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protocolo: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Tem certeza que quer remover %s dos marcadores?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Tem certeza que quer remover %s dos marcadores?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Remover a pasta?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Note que todas as suas subpastas e itens também serão removidos." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Remover o item?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Erro ao remover o marcador: Entrada não localizada" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Nova pasta" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Escolha o arquivo" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Formatos suportados" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Nenhum dos arquivos é suportado" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Nenhum dos plug-ins ativos oferecer um arquivo suportado a ser aberto. Ative " +"alguns plug-ins e tente novamente." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Não foi possível abrir o seguinte arquivo:" msgstr[1] "Não foi possível abrir os seguintes arquivos:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Não foi possível obter o protocolo ativo na lista de protocolos." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Erro ao salvar o arquivo de histórico: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Escolha um servidor VNC" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "O protocolo %s não é suportado." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Escolha uma área de trabalho remota" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Não foi possível abrir o arquivo." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Não foi possível analisar o arquivo." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Valor incorreto para a flag 'shared': %d. É esperado um valor 0 ou 1. " -"Ignorando-o." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Não foi possível encontrar o endereço da máquina no arquivo." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "O arquivo não foi reconhecido por nenhum plug-in." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Operação inválida" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Dados inválidos recebidos da operação drag&drop." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Máquinas próximas" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Abre um arquivo .vnc" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Abre o vinagre no modo tela cheia" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "nome do arquivo" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Cria um nova janela em uma instância existente do vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Abre um arquivo reconhecido pelo vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "nome do arquivo" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[servidor:porta]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "O seguinte erro ocorreu:" msgstr[1] "Os seguintes erros ocorreram:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- Cliente VNC para o GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Visualizador de Área de Trabalho Remota" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Execute \"vinagre --help\" para ver uma lista completa das opções de linha " "de comando" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Falha ao resolver o nome de máquina avahi: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "O plug-in %s já está registrou um navegador para o serviço %s." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Falha ao adicionar um navegador mDNS para o serviço %s." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Falha ao navegar por máquinas: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Falha ao inicializar um navegador mDNS: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "A conexão com a máquina %s foi fechada." +msgid "Connection to host %s was closed." +msgstr "A conexão com a máquina %s foi fechada." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Conexão fechada" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Falha ao se autenticar à máquina %s" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Falha na autenticação" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Conectando..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Fechar conexão" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Gerenciador de plug-ins" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Plug-in" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Habilitado" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "C_onfigurar" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_tivar" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "At_ivar tudo" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Desativar tudo" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Sobre Plug-in" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "C_onfigurar plug-in" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Não foi possível inicializar o gerenciador de preferências." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Erro ao conectar à máquina." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Falha ao se autenticar na máquina %s" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Falha na autenticação" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Sair da tela cheia" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Não há suporte ao método de autenticação da máquina %s. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Autenticação não suportada" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Erro ao salvar conexão recente." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Erro ao salvar a credencial no chaveiro." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Erro ao salvar as credenciais no chaveiro." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Erro de autenticação" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "É necessário um nome de usuário para acessar esta máquina." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "É necessária uma senha para acessar esta máquina." +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Não foi possível capturar uma imagem da conexão." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimizar janela" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Salvar captura de tela" -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Escalonamento" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Captura de tela de %s" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Apenas leitura" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Erro ao salvar captura de tela" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Capturar imagem da tela" +#: ../vinagre/vinagre-tube-handler.c:232 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Impossível obter as propriedades do serviço: %s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Enviar Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:289 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Impossível criar a conexão: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Nome da área de trabalho:" +#: ../vinagre/vinagre-tube-handler.c:328 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Impossível aceitar o tubo de fluxo: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Porta:" +#: ../vinagre/vinagre-tube-handler.c:404 +#, c-format +msgid "Failed to request name: %s" +msgstr "Falha ao requisitar nome: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensões:" +#: ../vinagre/vinagre-tube-handler.c:405 +msgid "No error given" +msgstr "Nenhum erro fornecido" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Não foi possível capturar uma imagem da conexão" +#: ../vinagre/vinagre-tube-handler.c:482 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Impossível obter o nome do contato: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:517 #, c-format -msgid "Screenshot of %s" -msgstr "Captura de tela de %s" +msgid "Impossible to get the avatar: %s" +msgstr "Impossível obter o avatar: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Salvar captura de tela" +#: ../vinagre/vinagre-tube-handler.c:538 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s quer compartilhar seu desktop com você." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Esta instalação não tem suporte a escalonamento.\n" -"\n" -"Leia o arquivo README (distribuído com o Vinagre) para saber como habilitar " -"este recurso." +#: ../vinagre/vinagre-tube-handler.c:543 +msgid "Desktop sharing invitation" +msgstr "Convite de compartilhamento de desktop" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Máquina" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Editar" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Ver" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "M_arcadores" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Conecta a uma máquina remota" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Abre um arquivo .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Sai do programa" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" -msgstr "Editar as preferências da aplicação" +msgstr "Edita as preferências do aplicativo" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Abrir marcador" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Conecta a esta máquina" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Editar marcador" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Edita os detalhes do marcador selecionado" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Remover dos marcadores" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Remove a conexão atual selecionada dos marcadores" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Nova pasta" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Cria uma nova pasta" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "S_umário" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Abre o manual do vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Sobre este aplicativo" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Barra de _ferramentas" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Mostra ou oculta a barra de ferramentas" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Barra de _status" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Mostra ou oculta a barra de status" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Painel lateral" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Mostra ou oculta o painel lateral" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Fecha a conexão atual" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Fechar todas" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Fecha todas as conexões ativas" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Adicionar aos marcadores" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" -msgstr "Adiciona conexão atual aos seus marcadores" +msgstr "Adiciona a conexão atual aos seus marcadores" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Capturar imagem da tela" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Captura uma imagem da tela da conexão ativa" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Envia Ctrl+Alt+Del para a conexão ativa" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Vê a máquina atual em tela cheia" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Tamanho _original" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Ajusta a janela para o tamanho do desktop remoto" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "Es_calonamento" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Ajusta a tela remota dentro do tamanho da janela atual" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "Apenas leitu_ra" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Desabilita mouse e teclado" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Barra de _ferramentas" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Mostra ou oculta a barra de ferramentas" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Barra de _status" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Mostra ou oculta a barra de status" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_Painel lateral" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Mostra ou oculta o painel lateral" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Ocorreu um erro:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre é um cliente VNC para o ambiente GNOME" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Não foi possível carregar o arquivo de construção: %s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre é um visualizador de áreas de trabalho remotas para o ambiente GNOME" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -756,7 +976,7 @@ "Foundation; tanto a versão 2 da Licença como (a seu critério) qualquer " "versão." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -768,7 +988,7 @@ "A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU " "para obter mais detalhes." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -776,35 +996,66 @@ "Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este " "programa. Se não, veja ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Vladimir Melo \n" "Og Maciel \n" -"Taylon Silmer " +"Taylon Silmer \n" +"Krix Apolinário \n" +"Henrique P Machado " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Site do Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Não foi possível mesclar vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "Conexões _recentes" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Abre %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Pressione Ctrl+Alt para liberar o cursor" +#~ msgid "Connection" +#~ msgstr "Conexão" + +#~ msgid "Folder" +#~ msgstr "Pasta" + +#~ msgid "host or host:display or host::port" +#~ msgstr "máquina ou máquina:tela ou máquina::porta" + +#~ msgid "Supported formats" +#~ msgstr "Formatos suportados" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Escolha um servidor VNC" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "Não foi possível encontrar o endereço da máquina no arquivo." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Abre um arquivo .vnc" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- Cliente VNC para o GNOME" + +#~ msgid "Minimize window" +#~ msgstr "Minimizar janela" + +#~ msgid "_Read only" +#~ msgstr "Apenas leitu_ra" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Pressione Ctrl+Alt para liberar o cursor" #~ msgid "gtk-close" #~ msgstr "gtk-close" @@ -847,9 +1098,6 @@ #~ "O escalonamento não funciona corretamente em janelas compostas. " #~ "Desabilite os efeitos visuais e tente novamente." -#~ msgid "_Port:" -#~ msgstr "_Porta:" - #~ msgid "Image" #~ msgstr "Imagem" diff -Nru vinagre-2.26.1/po/pt.po vinagre-2.29.1/po/pt.po --- vinagre-2.26.1/po/pt.po 2009-02-26 17:44:19.000000000 +0000 +++ vinagre-2.29.1/po/pt.po 2009-08-28 17:21:05.000000000 +0100 @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.26\n" +"Project-Id-Version: 2.28\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-25 00:45+0000\n" -"PO-Revision-Date: 2009-02-25 00:50+0000\n" +"POT-Creation-Date: 2009-08-26 00:09+0100\n" +"PO-Revision-Date: 2009-08-26 00:15+0000\n" "Last-Translator: Duarte Loreto \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" @@ -17,11 +17,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Sobre" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Ajuda" @@ -30,127 +30,121 @@ msgstr "Aceder a áreas de trabalho remotas" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Visualizador de Área de Trabalho Remota" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "É necessária autenticação" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Opções de ligação" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Ligação" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Pasta" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interface" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Opções" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Pasta Pai" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "A que máquina se quer ligar?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Todos os campos acima são obrigatórios" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Todos os campos acima são obrigatórios" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "É necessária autenticação" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Marcadores" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Ligação" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Opções de ligação" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Pasta" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Servidor:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interface" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Opções" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Pasta Pai" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Preferências" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "" -"Se deverão ou não ser apresentados separadores mesmo quando existe apenas " -"uma ligação activa" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "" -"Se deverão ou não ser apresentados os atalhos de menu (teclas de atalho)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "A que máquina se deseja ligar?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Apresentar sempre os separadores" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Autenticar" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Ecrã completo" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Servidor:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nome:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Senha:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protocolo:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Recordar esta credencial" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "E_scala" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Apresentar os atalhos de menu" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Utilizador:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Apenas _visualizar" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "plugins activos" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "máquina ou máquina:ecrã ou máquina::porto" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Lista de plugins activos. Contém a \"Localização\" dos plugins activos. " +"Consulte o ficheiro .vinagre-plugin para obter a \"Localização\" de um " +"plugin em específico." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Número máximo de itens de histórico no diálogo de ligação" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -160,7 +154,7 @@ "\" para os activar. Note que se estiverem activos, essas teclas serão " "interceptadas pelo menu e não serão enviadas para a máquina remota." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -169,15 +163,15 @@ "\"false\" para apenas apresentar separadores quando existir mais de uma " "ligação activa." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Especifica o número máximo de itens na lista de selecção de máquinas." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "O manipulador de URLs \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -188,10 +182,22 @@ "valor como \"true\" para partilhar a área de trabalho com os restantes " "clientes." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Se deverão ou não ser mantidos os outros clientes ligados" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Se deverão ou não ser apresentados separadores mesmo quando existe apenas " +"uma ligação activa" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "" +"Se deverão ou não ser apresentados os atalhos de menu (teclas de atalho)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Ficheiro de Área de Trabalho Remota (VNC)" @@ -200,91 +206,271 @@ msgid "Remote Desktop Connection" msgstr "Ligação a Área de Trabalho Remota" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Aceder a consolas Unix/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Porto:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Suporte SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Valor inválido para o parâmetro 'shared': %d. É suposto ser 0 ou 1. A " +"ignorar." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Activar o modo escalado" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Opções VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Apresentar Opções VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Aceder a máquinas Unix/Linux, Windows e outras." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Incapaz de processar o ficheiro." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "O ficheiro não é um de VNC: Falta o grupo \"connection\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "O ficheiro não é um de VNC: Falta a chave \"host\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Opções VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Apenas _visualizar" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "E_scala" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Ficheiros VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nome do Ambiente de Trabalho:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensões:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Erro ao ligar ao servidor." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Método de autenticação do servidor %s não é suportado. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Método de autenticação não suportado" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Erro na autenticação" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "É necessário um utilizador para aceder a esta máquina." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "É necessária uma senha para aceder a esta máquina." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "Es_calar" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Redimensiona o ecrã remoto ao tamanho actual da janela" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Não envia eventos de rato e teclado" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Tamanho _original" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Ajusta o tamanho da janela à dimensão da área de trabalho remota" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Enviar Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Envia Ctrl+Alt+Del à máquina remota" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Escala" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Apenas de leitura" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Escalar não é suportado nesta instalação.\n" +"\n" +"Leia o ficheiro README (distribuído com o Vinagre) para saber como activar " +"esta funcionalidade." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Suporte VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Um menu para rapidamente aceder a uma máquina remota" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Fábrica de Applet Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Incapaz de executar o vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Abrir Visualizador de Área de Trabalho Remota" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Aceder aos seus marcadores" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "O protocolo %s não é suportado." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Erro ao inicializar marcadores: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Erro desconhecido" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Erro ao inicializar os marcadores: O ficheiro parece estar vazio" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "" "Erro ao inicializar os marcadores: O ficheiro não é um de marcadores vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Erro ao gravar marcadores: Falha ao criar a estrutura XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Erro ao gravar marcadores: Falha ao inicializar a estrutura XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Erro ao gravar marcadores: Falha ao finalizar a estrutura XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Erro ao gravar marcadores: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Erro ao migrar os marcadores: Falha ao criar a estrutura XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Erro ao migrar os marcadores: Falha ao inicializar a estrutura XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Erro ao migrar os marcadores: Falha ao finalizar a estrutura XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Erro ao migrar os marcadores: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Erro ao migrar os marcadores: O plugin VNC não está activo" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Falha ao criar o directório" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -292,447 +478,481 @@ "A migrar o ficheiro de marcadores para o novo formato. Esta operação " "supostamente só deverá ser executada uma vez." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Erro ao abrir o ficheiro de marcadores antigo: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migração cancelada" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Incapaz de remover o ficheiro de marcadores antigo" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Pasta Raiz" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Nome inválido para esta pasta" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "" +"O nome \"%s\" já está a ser utilizado nesta pasta. Utilize um nome diferente." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "Nome inválido para este item" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protocolo: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Tem a certeza de que deseja remover %s dos marcadores?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Tem a certeza de que deseja remover %s dos marcadores?" -#: ../src/vinagre-bookmarks-ui.c:241 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Remover a Pasta?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Note que todas as suas subpastas e itens serão também removidos." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Remover Itens?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Erro ao remover o marcador: Entrada não encontrada" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Nova Pasta" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Seleccione o ficheiro" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Formatos suportados" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Não existem ficheiros suportados" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Nenhum dos plugins activos oferece suporte para abrir o ficheiro. Active " +"alguns plugins e tente novamente." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Não foi possível abrir o seguinte ficheiro:" msgstr[1] "Não foi possível abrir os seguintes ficheiros:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Incapaz de obter o protocolo activo na lista de protocolos." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Erro ao gravar o ficheiro de histórico: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Seleccione um Servidor de VNC" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Seleccione uma Área de Trabalho Remota" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "O protocolo %s não é suportado." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Incapaz de abrir o ficheiro." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Incapaz de processar o ficheiro." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "O ficheiro não foi reconhecido por nenhum dos plugins." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Valor inválido para o parâmetro 'shared': %d. É suposto ser 0 ou 1. A " -"ignorar." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Incapaz de encontrar o endereço da máquina no ficheiro." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Operação inválida" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Dados recebidos da operação arrastar&largar são inválidos." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Máquinas próximas" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Abre um ficheiro .vnc" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "nomedoficheiro" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Abrir o vinagre em modo de ecrã completo" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Criar uma nova janela de topo numa instância existente do vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Abrir um ficheiro reconhecido pelo vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "nomedoficheiro" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[servidor:porto]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Ocorreu o seguinte erro:" msgstr[1] "Ocorreram os seguintes erros:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- Cliente VNC para o GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Visualizador de Área de Trabalho Remota" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Execute 'vinagre --help' para consultar uma lista completa das opções " "disponíveis na linha de comandos" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Falha ao resolver nome de máquina avahi: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "O plugin %s já registou um navegador para o serviço %s." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Falha ao adicionar um navegador mDNS para o serviço %s." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Falha ao navegar por máquinas: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Falha ao inicializar o navegador mDNS: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Ligação ao servidor %s foi terminada." +msgid "Connection to host %s was closed." +msgstr "A ligação ao servidor %s foi terminada." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Ligação terminada" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Falha na autenticação com o servidor %s" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Falha na autenticação" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "A Ligar..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Fechar a ligação" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Gestor de Plugins" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Plugin" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Activo" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "C_onfigurar" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ctivar" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ac_tivar Todos" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Desactivar Todos" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Sobre o Plugin" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "C_onfigurar o Plugin" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Incapaz de inicializar gestor de preferências." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Erro ao ligar ao servidor." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Falha na autenticação com o servidor %s" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Falha na autenticação" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Método de autenticação do servidor %s não é suportado. (%u)" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Deixar modo de ecrã completo" -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Método de autenticação não suportado" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Erro ao gravar ligação recente." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Erro ao guardar as credenciais no chaveiro." - -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Erro na autenticação" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "É necessário um utilizador para aceder a esta máquina." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Erro ao gravar as credenciais no chaveiro." -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "É necessária uma senha para aceder a esta máquina." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimizar a janela" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Incapaz de capturar uma imagem do ecrã da ligação." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Escala" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Gravar a Captura de Ecrã" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Apenas de leitura" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Captura de Ecrã de %s" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Capturar uma imagem do ecrã" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Erro ao gravar a captura de ecrã" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Enviar Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Incapaz de obter a propriedade do serviço: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Nome do Ambiente de Trabalho:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Incapaz de criar a ligação: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Porto:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Incapaz de aceitar o fluxo de dados: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensões:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Incapaz de obter o nome do contacto: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Incapaz de capturar uma imagem do ecrã da ligação." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Incapaz de obter o avatar: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "Captura de Ecrã de %s" +msgid "%s wants to share his desktop with you." +msgstr "%s deseja partilhar a sua área de trabalho consigo." -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Gravar a Captura de Ecrã" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Escalar não é suportado nesta instalação.\n" -"\n" -"Leia o ficheiro README (distribuído com o Vinagre) para saber como activar " -"esta funcionalidade." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Convite para a partilha de área de trabalho" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Máquina" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Editar" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Ver" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Abrir uma ligação a uma máquina remota" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Abrir um ficheiro .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Sair da aplicação" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Editar as preferências da aplicação" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Abrir um marcador" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Ligar a esta máquina" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Editar um marcador" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Editar os detalhes do marcador seleccionado" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Remover dos marcadores" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Remover a ligação actualmente seleccionada dos marcadores" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Nova Pasta" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Criar uma nova pasta" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Conteúdo" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Abrir o manual do vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Sobre esta aplicação" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Barra de Ferramen_tas" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Apresentar ou esconder a barra de ferramentas" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Barra de E_stados" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Apresentar ou esconder a barra de estados" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Painel Lateral" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Apresentar ou esconder o painel lateral" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Fechar a ligação actual" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "Fec_har Tudo" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Fechar todas as ligações activas" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Adicionar aos marcadores" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Adicionar a ligação actual aos marcadores" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Capturar uma imagem do ecrã" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Capturar uma imagem do ecrã da ligação activa" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Enviar Ctrl+Alt+Del às ligações activas" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Ver a máquina actual em ecrã completo" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Tamanho _original" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Ajusta o tamanho da janela à dimensão da área de trabalho remota" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "Es_calar" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Redimensionar o ecrã remoto ao tamanho actual da janela" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Apenas de leitura" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Desactivar o rato e teclado" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Barra de Ferramen_tas" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Apresentar ou esconder a barra de ferramentas" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Barra de E_stados" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Apresentar ou esconder a barra de estados" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_Painel Lateral" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Apresentar ou esconder o painel lateral" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Ocorreu um erro:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre é um cliente VNC para o Ambiente de Trabalho GNOME" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Incapaz de abrir o ficheiro de construção: %s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre é um visualizador de áreas de trabalho remotas para o Ambiente de Trabalho GNOME" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -744,7 +964,7 @@ "Software Foundation; ou a versão 2 da Licença ou (à sua escolha) qualquer " "versão posterior." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -756,7 +976,7 @@ "UM DETERMINADO PROPÓSITO. Consulte a Licença Pública Genérica GNU para mais " "detalhes." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -764,34 +984,63 @@ "Deverá ter recebido uma cópia da Licença Pública Genérica GNU com esta " "aplicação. Caso contrário, consulte ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Duarte Loreto , Filipe Gomes " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Página Web do Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Incapaz de juntar vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "Ligações _recentes" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Abrir %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Pressione Ctrl+Alt para libertar o cursor" +#~ msgid "Connection" +#~ msgstr "Ligação" + +#~ msgid "Folder" +#~ msgstr "Pasta" + +#~ msgid "host or host:display or host::port" +#~ msgstr "máquina ou máquina:ecrã ou máquina::porto" + +#~ msgid "Supported formats" +#~ msgstr "Formatos suportados" + +#~ msgid "Choose a VNC Server" +#~ msgstr "Seleccione um Servidor de VNC" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "Incapaz de encontrar o endereço da máquina no ficheiro." + +#~ msgid "Opens a .vnc file" +#~ msgstr "Abre um ficheiro .vnc" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- Cliente VNC para o GNOME" + +#~ msgid "Minimize window" +#~ msgstr "Minimizar a janela" + +#~ msgid "_Read only" +#~ msgstr "_Apenas de leitura" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Pressione Ctrl+Alt para libertar o cursor" #~ msgid "Editing a bookmark" #~ msgstr "Editar um marcador" @@ -830,9 +1079,6 @@ #~ "Escalar não funciona adequadamente em janelas compostas. Desactive os " #~ "efeitos visuais e tente novamente." -#~ msgid "_Port:" -#~ msgstr "_Porto:" - #~ msgid "Image" #~ msgstr "Imagem" diff -Nru vinagre-2.26.1/po/ro.po vinagre-2.29.1/po/ro.po --- vinagre-2.26.1/po/ro.po 2009-02-19 20:17:32.000000000 +0000 +++ vinagre-2.29.1/po/ro.po 2009-09-17 15:20:20.000000000 +0100 @@ -1,797 +1,1016 @@ # Romanian translation for vinagre # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 # This file is distributed under the same license as the vinagre package. -# FIRST AUTHOR , 2008. -# +# Lucian Adrian Grijincu , 2009. +# Adi Roiban https://launchpad.net/~adiroiban, 2009 msgid "" msgstr "" "Project-Id-Version: vinagre\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-02-18 20:37+0000\n" -"PO-Revision-Date: 2009-02-19 15:22+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=vinagre&component=general\n" +"POT-Creation-Date: 2009-09-07 11:18+0000\n" +"PO-Revision-Date: 2009-09-14 00:48+0300\n" "Last-Translator: Adi Roiban \n" -"Language-Team: Romanian \n" +"Language-Team: Gnome Romanian Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 == 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2009-01-14 03:08+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2);;\n" +"X-Generator: Virtaal 0.3.1\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" -msgstr "_Despre..." +msgstr "_Despre" -#: ../data/GNOME_VinagreApplet.xml.h:2 -#: ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Ajutor" -#: ../data/vinagre.desktop.in.in.h:1 -#: ../data/vinagre-file.desktop.in.in.h:1 +#: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 msgid "Access remote desktops" -msgstr "Acces calculatoare la distanță" +msgstr "Accesați desktopuri la distanță" -#: ../data/vinagre.desktop.in.in.h:2 -#: ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 -#: ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 -#: ../src/vinagre-main.c:151 +#: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" -msgstr "Vizualizator Remote Desktop" +msgstr "Vizualizare desktop la distanță" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Authentificarea este necesară" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Opțiuni conexiune" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Conexiune" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Dosar" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Interfață" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Opțiuni" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Dosar părinte" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "La ce calculator doriți să vă conectați?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Toate câmpurile de mai sus sunt obligatorii" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Toate câmpurile de mai sus sunt obligatorii" -#: ../data/vinagre.glade.h:10 -#: ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Se cere autentificare" + +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Favorite" -#: ../data/vinagre.glade.h:11 -#: ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1066 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Conexiune" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Opțiuni conexiune" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Dosar" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Gazdă:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Interfață" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Opțiuni" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Dosar părinte" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Preferințe" -#: ../data/vinagre.glade.h:13 -#: ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "Dacă trebuie afișate taburile, chiar și atunci când există doar o conexiune activă." - -#: ../data/vinagre.glade.h:14 -#: ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Dacă trebuie afișăți acceleratorii din meniuri (scurtăturile)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "La ce calculator doriți să vă conectați?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" -msgstr "_Afișează întotdeauna taburile" +msgstr "_Arată întotdeauna taburile" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 -#| msgid "Authentication failed" +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Autentifică" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Pe tot ecranul" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Gazdă:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Nume:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Parolă:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protocol:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "Memo_rează această certificare" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Scalare" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" -msgstr "Afișeză _scurtăturile meniului" +msgstr "Arată _scurtăturile meniului" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "Nume _utilizator:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Doar _vizualizare" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Module active" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "gazdă sau gazdă:ecran sau gazdă::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Lista modulelor active. Conține „Locația” modulelor active. Informații " +"suplimentare despre cum se poate obține „Locația” unui modul dat, pot fi " +"găsite în fișierul .vinagre-plugin." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Numărul maxim de elemente de istoric din dialogul de conectare" -#: ../data/vinagre.schemas.in.h:2 -msgid "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. Note that if they are enabled, those keys will be intercepted by the menu and will not be sent to the remote host." -msgstr "Definește ca „false” pentru a dezactiva scurtăturile meniului. Definește la „true” pentru a le activa. Dacă ele sunt activate, acele taste vor fi interceptate de meniu și nu vor fi trimise câtre gazda de la distanță." - -#: ../data/vinagre.schemas.in.h:3 -msgid "Set to \"true\" to always show the tabs. Set to \"false\" to only show the tabs when there is more than one active connection." -msgstr "Definește ca „true” pentru a afișa întotdeauna taburile. Definește ca „false” pentru a afișa taburile doar când sunt mai mult de o conexiune activă." +#: ../data/vinagre.schemas.in.in.h:4 +msgid "" +"Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " +"Note that if they are enabled, those keys will be intercepted by the menu " +"and will not be sent to the remote host." +msgstr "" +"Definiți ca „false” pentru a dezactiva scurtăturile meniului. Definiți ca " +"„true” pentru a le activa. Dacă ele sunt activate, acele taste vor fi " +"interceptate de meniu și nu vor fi trimise câtre gazda de la distanță." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:5 +msgid "" +"Set to \"true\" to always show the tabs. Set to \"false\" to only show the " +"tabs when there is more than one active connection." +msgstr "" +"Definiți ca „true” pentru a afișa întotdeauna taburile. Definiți ca " +"„false” pentru a afișa taburile doar când sunt mai mult de o conexiune " +"activă." + +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." -msgstr "Specifică numărum maxim de elemente din câmpul de introducere a gazdei." +msgstr "" +"Specifică numărum maxim de elemente din câmpul de introducere a gazdei." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Operatorul pentru URL-uri „vnc://”" -#: ../data/vinagre.schemas.in.h:6 -msgid "When connecting to a host, the client can say to the server to leave other clients connected or to drop the existent connections. Set the value to true to share the desktop with the other clients." -msgstr "Când se conectează la o gazdă, clientul poate spune serverului să lasă altă clienți conectați sau să închidă conexiunile existente. Definiți valoare la „true” pentru a partaja desktop-ul cu altă clienți." +#: ../data/vinagre.schemas.in.in.h:8 +msgid "" +"When connecting to a host, the client can say to the server to leave other " +"clients connected or to drop the existent connections. Set the value to true " +"to share the desktop with the other clients." +msgstr "" +"Când se conectează la o gazdă, clientul poate spune serverului să lase alți " +"clienți conectați sau să închidă conexiunile existente. Definiți ca „true” " +"pentru a partaja desktopul cu altă clienți." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Dacă ar trebui să fie lasați conectați alți clienți" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "" +"Dacă trebuie afișate taburile chiar și atunci când există doar o conexiune " +"activă." + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Dacă trebuie afișați acceleratorii din meniuri (scurtăturile)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" -msgstr "Fișier Remote Desktop (VNC)" +msgstr "Fișier desktop la distanță (VNC)" #: ../data/vinagre-mime.xml.in.h:2 msgid "Remote Desktop Connection" -msgstr "Conexiune Remote Desktop" +msgstr "Conexiune desktop la distanță" + +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Accesați terminale Unix/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Suport SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Valoare greșită pentru fanionul „shared”: %d. Trebuie să fie 0 sau 1. Se " +"ignoră." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Activează modul scalat" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Preferințe VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Afișează opțiunile VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Accesați mașini Unix/Linux, Windows etc." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Nu s-a putut analiza fișierul." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Fișierul nu este unul VNC: Lipsește grupul „connection”." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Fișierul nu este unul VNC: Lipsește cheia „host”." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Preferințe VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Doar _vizualizare" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Scalare" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Fișiere VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Nume desktop:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensiuni:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Eroare la conectarea la gazdă." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Metoda de autentificare la gazda %s nu este suportată. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Autentificare nesuportată" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Eroare la autentificare" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Este nevoie de un nume de utilizator pentru a accesa acest calculator." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Este nevoie de o parolă pentru a accesa acest calculator." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "S_calare" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Potrivește ecranul de la distanță în dimensiunea curentă a ferestrei" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Nu trimite evenimente de maus sau tastatură" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Dimensiune _originală" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Ajustează fereastra la dimensiunea desktopului de la distanță" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Trimite Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Trimite Ctrl+Alt+Del mașinii la distanță" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Scalare" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Doar citire" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Scalarea nu este suportată în acestă instalare.\n" +"\n" +"Pentru a afla cum să activați această facilitate, citiți fișierul README " +"(distribuit cu Vinagre)." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Suport VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Un meniul pentru a accesa rapid mașini la distanță" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Șablon miniaplicație Vinagre" -#: ../src/vinagre-applet.c:271 -#: ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Nu s-a putut porni vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Deschide vizualizatorul de desktop la distanță" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Accesare favorite" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protocolul %s nu este suportat." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Eroare la inițializare favorite: %s" -#: ../src/vinagre-bookmarks.c:344 -#: ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:275 -#: ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 -#: ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Eroare necunoscută" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Eroare la inițializare favorite: Acest fișier pare a fi gol" -#: ../src/vinagre-bookmarks.c:358 -msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "Eroare la inițializare favorite: Acest fișier nu este un fișier favorit vinagre" +#: ../vinagre/vinagre-bookmarks.c:357 +msgid "" +"Error while initializing bookmarks: The file is not a vinagre bookmarks file" +msgstr "" +"Eroare la inițializare favorite: Acest fișier nu este un fișier favorit " +"vinagre" -#: ../src/vinagre-bookmarks.c:420 -#: ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" -msgstr "Eroare la salvare favorit: Creearea structurii XML a eșuat" +msgstr "Eroare la salvarea favoritelor: Crearea structurii XML a eșuat" -#: ../src/vinagre-bookmarks.c:434 -#: ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" -msgstr "Eroare la salvare favorit: Inițializarea structurii XML a eșuat" +msgstr "Eroare la salvarea favoritelor: Inițializarea structurii XML a eșuat" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" -msgstr "Eroare la salvare favorit: Finalizarea structurii XML a eșuat" +msgstr "Eroare la salvarea favoritelor: Finalizarea structurii XML a eșuat" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" -msgstr "Eroare l-a salvare favorit: %s" +msgstr "Eroare la salvarea favoritelor: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" -msgstr "Eroare la migrarea fișierului favorit: Creearea structurii XML a eșuat" +msgstr "Eroare la migrarea favoritelor: Creearea structurii XML a eșuat" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" -msgstr "Eroare la migrarea fișierului favorit: Inițializarea structurii XML a eșuat" +msgstr "Eroare la migrarea favoritelor: Inițializarea structurii XML a eșuat" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" -msgstr "Eroare la migrarea fișierului favorit: Finalizarea structurii XML a eșuat" +msgstr "Eroare la migrarea favoritelor: Finalizarea structurii XML a eșuat" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" -msgstr "Eroare la migrare favorit: %s" +msgstr "Eroare la migrarea favoritelor: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Eroare la migrarea favoritelor: modulul VNC nu este activat" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" -msgstr "Eroare la creearea dosarului" +msgstr "Eroare la crearea dosarului" -#: ../src/vinagre-bookmarks-migration.c:255 -msgid "Migrating the bookmarks file to the new format. This operation is only supposed to run once." -msgstr "Migrarea fișierului favorit în noua locație. Se presupune că această operație este rulată doar o singură dată." +#: ../vinagre/vinagre-bookmarks-migration.c:262 +msgid "" +"Migrating the bookmarks file to the new format. This operation is only " +"supposed to run once." +msgstr "" +"Se migrează fișierul favoritelor în noua locație. Se presupune că această " +"operație este rulată doar o singură dată." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" -msgstr "Eroare la deschidere fișier favorit vechi: %s" +msgstr "Eroare la deschiderea fișierului favorit vechi: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migrare anulată" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" -msgstr "Nu s-a putut șterge fișier vechi favorit" +msgstr "Nu s-a putut șterge fișierul vechi al favoritelor" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Dosar rădăcină" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Nume nevalid pentru acest dosar" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Sigur doriți să ștergeți %s din favorite?" +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "Numele „%s” este deja folosit în acest dosar. Alegeți alt nume." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "Nume nevalid pentru acest element" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protocol: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Doriți să ștergeți %s din lista de favorite?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" -msgstr "Șterge dosar ?" +msgstr "Ștergeți dosarul?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." -msgstr "Atenție, toate subdosarele și elementele vor fi deasemenea șterse." +msgstr "Atenție! Toate subdosarele și elementele vor fi de asemenea șterse." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" -msgstr "Șterge element ?" +msgstr "Ștergeți elementul?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" -msgstr "Eroare la ștergere favorit: Intrarea nu a fost găsită" +msgstr "Eroare la ștergerea favoritului: Intrarea nu a fost găsită" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Dosar nou" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Alegeți fișierul" -#: ../src/vinagre-commands.c:124 -#: ../src/vinagre-tab.c:1156 -msgid "Supported formats" -msgstr "Formate suportate" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Nu există nici un fișier suportat." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Niciunul dintre modulele active nu oferă un fișier suportat pentru " +"deschidere. Activați câteva module și reîncercați." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Următorul fișier nu a putut fi deschis:" msgstr[1] "Următoarele fișiere nu au putut fi deschise:" msgstr[2] "Următoarele fișiere nu au putut fi deschise:" -#: ../src/vinagre-connect.c:179 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Nu s-a putut găsi protocolul activ din lista de protocoale." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Eroare la salvarea fișierului istoric: %s" -#: ../src/vinagre-connect.c:191 -msgid "Choose a VNC Server" -msgstr "Alegeți un server VNC" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Alegeți un desktop la distanță" -#: ../src/vinagre-connection.c:600 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protocolul %s nu este suportat." - -#: ../src/vinagre-connection.c:695 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Nu s-a putut deschide fișierul." -#: ../src/vinagre-connection.c:714 -msgid "Could not parse the file." -msgstr "Nu s-a putut analiza fișierul." - -#: ../src/vinagre-connection.c:759 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "Valoare greșită pentru fanionul „shared”: %d. Trebuie să fie 0 sau 1. Se ignoră." - -#: ../src/vinagre-connection.c:765 -msgid "Could not find the host address in the file." -msgstr "Nu s-a putut găsi adresa gazdei în fișier." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Fișierul nu a fost recunoscut de niciunul dintre module." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Operație nevalidă" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Datele primite de la operația „drag&drop” nu sunt valide." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Gazde în apropiere" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Deschide un fișier .vnc" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Deschide vinagre în modul pe tot ecranul" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 +msgid "Create a new toplevel window in an existing instance of vinagre" +msgstr "" +"Creează o nouă fereastră principală într-o instanță existentă de vinagre" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Deschide un fișier recunocut de vinagre" -#: ../src/vinagre-main.c:53 +#: ../vinagre/vinagre-main.c:70 msgid "filename" msgstr "nume fișier" -#: ../src/vinagre-main.c:56 -msgid "Create a new toplevel window in an existing instance of vinagre" -msgstr "Creează o nouă fereastră principală într-o instanță existentă de vinagre" - -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "A intervenit următoarea eroare:" -msgstr[1] "Au intervenit următoarele eroari:" -msgstr[2] "Au intervenit următoarele eroari:" +msgstr[1] "Au intervenit următoarele erori:" +msgstr[2] "Au intervenit următoarele erori:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- client VNC pentru GNOME" - -#: ../src/vinagre-main.c:146 -msgid "Run 'vinagre --help' to see a full list of available command line options" -msgstr "Rulați „vinagre --help” pentru a vedea lista completă a opțiunilor din linia de comandă" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Vizualizator desktop la distanță" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-main.c:193 +msgid "" +"Run 'vinagre --help' to see a full list of available command line options" +msgstr "" +"Rulați „vinagre --help” pentru a vedea lista completă a opțiunilor din linia " +"de comandă" + +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Rezolvarea numelui gazdă avahi a eșuat: %s\n" -#: ../src/vinagre-mdns.c:175 -#: ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Modulul %s a înregistrat deja un navigator pentru serviciul %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Adăugarea navigatoarelor mDNS pentru serviciul %s a eșuat." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Navigarea gazdelor a eșuat: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Inițializarea navigatorului mDNS a eșuat: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Conexiunea la gazda %s a fost închisă." +msgid "Connection to host %s was closed." +msgstr "Conexiunea la gazda %s a fost închisă." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Conexiunea a fost închisă" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Autentificarea la gazda %s a eșuat" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Autentificarea a eșuat" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Se conectează..." -#: ../src/vinagre-notebook.c:221 -#: ../src/vinagre-tab.c:882 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Închide conexiune" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Administrator de module" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Modul" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Activat" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "C_onfigurează" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ctivează" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Activează _tot" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Dezactivează tot" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Despre modul" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "C_onfigurează modul" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Nu s-a putut inițializa managerul de preferințe." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Eroare la conectarea la gazdă." +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Ieși din modul pe tot ecranul" -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Autentificarea la gazda %s a eșuat" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Autentificarea a eșuat" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Metoda de autentificare la gazda %s nu este suportată. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Autentificare nesuportată" - -#: ../src/vinagre-tab.c:464 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Eroare la salvarea conexiunii recente." -#: ../src/vinagre-tab.c:496 -msgid "Error saving the credential on the keyring." -msgstr "Eroare la salvarea certificării în inelul e chei." - -#: ../src/vinagre-tab.c:751 -#: ../src/vinagre-tab.c:768 -#| msgid "Authentication failed" -msgid "Authentication error" -msgstr "Eroare autentificare" - -#: ../src/vinagre-tab.c:752 -msgid "A username is required in order to access this machine." -msgstr "Este nevoie de un nume de utilizator pentru a accesa acest calculator." - -#: ../src/vinagre-tab.c:769 -msgid "A password is required in order to access this machine." -msgstr "Este nevoie de o parolă pentru a accesa acest calculator." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Eroare la salvarea credențialelor în inelul de chei." -#: ../src/vinagre-tab.c:895 -msgid "Minimize window" -msgstr "Minimizare fereastră" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Nu s-a putut obține o captură de ecran pentru conexiune." -#: ../src/vinagre-tab.c:910 -#: ../src/vinagre-tab.c:911 -msgid "Scaling" -msgstr "Scalare" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Salvează captura de ecran" -#: ../src/vinagre-tab.c:920 -#: ../src/vinagre-tab.c:921 -msgid "Read only" -msgstr "Doar citire" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Captură de ecran pentru %s" -#. Machine menu -#: ../src/vinagre-tab.c:931 -#: ../src/vinagre-tab.c:932 -#: ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Capturează ecranul" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Eroare la salvarea capturii de ecran" -#: ../src/vinagre-tab.c:940 -#: ../src/vinagre-tab.c:941 -#: ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Trimite Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Nu s-a putut obține proprietatea de serviciu: %s" -#: ../src/vinagre-tab.c:1065 -msgid "Desktop Name:" -msgstr "Nume birou:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Nu se poate realiza conexiunea: %s" -#: ../src/vinagre-tab.c:1067 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Nu s-a putut accepta fișierul flux: %s" -#: ../src/vinagre-tab.c:1068 -msgid "Dimensions:" -msgstr "Dimensiuni:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Nu s-a putut obține numele de contact: %s" -#: ../src/vinagre-tab.c:1134 -msgid "Could not get a screenshot of the connection." -msgstr "Nu s-a putut obține o captură de ecran pentru conexiune." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Nu s-a putut obține avatarul: %s" -#: ../src/vinagre-tab.c:1142 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "Captură de ecran pentru %s" +msgid "%s wants to share his desktop with you." +msgstr "%s dorește să vă ofere acces la desktopul propriu." -#: ../src/vinagre-tab.c:1145 -msgid "Save Screenshot" -msgstr "Salvează captura de ecran" - -#: ../src/vinagre-tab.c:1209 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable this feature." -msgstr "" -"Scalarea nu este suportată în acestă instalare.\n" -"\n" -"Pentru a afla cum să activați această facilitate, citiți fișierul README (distribuit cu Vinagre)." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Invitație partajare desktop" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Calculator" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Editare" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Vizualizare" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "Favo_rite" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" -msgstr "Conectare la gazdă la distanță" +msgstr "Conectare la o gazdă la distanță" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Deschide un fișier .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Închide aplicația" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" -msgstr "Modificarea preferințelor aplicației" +msgstr "Editați preferințele aplicației" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" -msgstr "Deschide fav_orite" +msgstr "Deschide fav_orit" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Conectare la acestă mașină" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" -msgstr "Modifică favorit_e" +msgstr "_Editare favorite" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" -msgstr "Modifică detaliile pentru favoritul selectat" +msgstr "Editați detaliile pentru favoritul selectat" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "Ște_rge din favorite" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Șterge din favorite conexiunea selectată curent" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "Dosar _nou" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Creează un dosar nou" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Conținut" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" -msgstr "Deschide manualul Vinagre" +msgstr "Deschide manualul vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Despre această aplicație" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "Bară de unel_te" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Afișează sau ascunde bara de unelte" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "Bară de _stare" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Afișează sau ascunde bara de stare" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Panou lateral" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Afișează sau ascunde panoul lateral" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Închide conexiunea curentă" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" -msgstr "Î_nchide toate" +msgstr "Î_nchide tot" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Închide toate conexiunile active" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Adaugă la favorite" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Adaugă conexiunea curentă la favorite" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Capturează ecranul" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Fă o captură de ecran pentru conexiunea curentă" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Trimite Ctrl+Alt+Del conexiunii active" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Vizualizează calculatorul curent pe tot ecranul" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Dimensiune _originală" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Ajustează fereastra la dimensiunea desktop-ului de la distanță" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "S_calare" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Potrivește ecranul de la distanță în dimensiunea curentă a ferestrei" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "Doar citi_re" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Dezactivare mouse și tastatură" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "Bară de unel_te" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Afișează sau ascunde bara de unelte" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "Bara de _stare" +#: ../vinagre/vinagre-utils.c:75 +msgid "An error has occurred:" +msgstr "S-a produs o eroare:" -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Afișează sau ascunde bara de stare" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Nu s-a putut încărca fișierul builder: %s" -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "_Panou lateral" +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "" +"Vinagre este o aplicație de vizualizare la mașini pentru desktopul GNOME" -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Afișează sau ascunde panoul lateral" +#: ../vinagre/vinagre-utils.c:456 +msgid "" +"Vinagre 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 "" +"Vinagre este un program liber; îl puteți redistribui și/sau modifica în " +"conformitate cu termenii Licenței Publice Generale GNU așa cum este " +"publicată de Free Software Foundation; fie versiunea 2 a Licenței, fie (la " +"latitudinea dumneavoastră) orice versiune ulterioară." -#: ../src/vinagre-utils.c:75 -msgid "An error has occurred:" -msgstr "S-a produs o eroare:" +#: ../vinagre/vinagre-utils.c:460 +msgid "" +"Vinagre 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 "" +"Vinagre este distribuit cu speranța că va fi util, dar FĂRĂ NICI O GARANȚIE, " +"fără garanție implicită de vandabilitate și conformitate unui anumit scop. " +"Citiți Licența Publică Generală GNU pentru detalii." -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre este un client VNC pentru mediul GNOME" - -#: ../src/vinagre-utils.c:436 -msgid "Vinagre 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 "Vinagre este un program liber; îl puteți redistribui și/sau modifica în conformitate cu termenii Licenței Publice Generale GNU așa cum este publicată de Free Software Foundation; fie versiunea 2 a Licenței, fie (la latitudinea dumneavoastră) orice versiune ulterioară." - -#: ../src/vinagre-utils.c:440 -msgid "Vinagre 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 "Vinagre este distribuit cu speranța că va fi util, dar FĂRĂ NICI O GARANȚIE, fără garanție implicită de vandabilitate și conformitate unui anumit scop. Citiți Licența Publică Generală GNU pentru detalii." - -#: ../src/vinagre-utils.c:444 -msgid "You should have received a copy of the GNU General Public License along with this program. If not, see ." -msgstr "Ar fi trebuit ca împreună cu programul să fi primit o copie a Licenței generale GNU. Dacă nu consulați ." +#: ../vinagre/vinagre-utils.c:464 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"this program. If not, see ." +msgstr "" +"Ar fi trebuit ca împreună cu programul să fi primit o copie a Licenței " +"generale GNU. Dacă nu consulați ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Adi Roiban https://launchpad.net/~adiroiban" +" Adi Roiban https://launchpad.net/~adiroiban\n" +" Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Pagina web Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Nu s-a putut combina vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "Conexiuni _recente" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Deschide %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Apăsați Ctrl+Alt pentru a lăsă cursorul" - -#~ msgid "Editing a bookmark" -#~ msgstr "Editarea unei conexiuni favorite" -#~ msgid "Enter a name for this connection" -#~ msgstr "Introduceți un nume pentru această conexiune" -#~ msgid "" -#~ "In order to connect on this machine, a password is required. Please " -#~ "supply it." -#~ msgstr "" -#~ "Pentru a vă conecta la această mașină este necesară o parolă. Vă rugăm " -#~ "să o furnizați." -#~ msgid "Editing a bookmark" -#~ msgstr "Editarea unei conexiuni favorite" -#~ msgid "Saving to bookmarks" -#~ msgstr "Se salvează favorit" -#~ msgid "_Bookmark name:" -#~ msgstr "Nume _favorit:" -#~ msgid "Confirm removal?" -#~ msgstr "Confirmați ștergere?" -#~ msgid "Error while removing %s from bookmarks: %s" -#~ msgstr "Eroare la ștergerea %s din favorite: %s" -#~ msgid "" -#~ "Scaling does not work properly on composited windows. Disable the visual " -#~ "effects and try again." -#~ msgstr "" -#~ "Scalarea nu funcționează corespunzător în ferestre compozite. Dezactivați " -#~ "efectele vizuale și încercați din nou." - diff -Nru vinagre-2.26.1/po/sl.po vinagre-2.29.1/po/sl.po --- vinagre-2.26.1/po/sl.po 2009-03-26 18:20:03.000000000 +0000 +++ vinagre-2.29.1/po/sl.po 2009-09-17 15:20:20.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: vinagre\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-25 20:51+0000\n" -"PO-Revision-Date: 2009-03-26 15:56+0100\n" +"POT-Creation-Date: 2009-09-14 10:52+0000\n" +"PO-Revision-Date: 2009-09-16 10:11+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "MIME-Version: 1.0\n" @@ -22,11 +22,12 @@ "X-Poedit-SourceCharset: utf-8\n" #: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_O Programu" #: ../data/GNOME_VinagreApplet.xml.h:2 -#: ../src/vinagre-ui.h:37 +#: ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Pomoč" @@ -37,152 +38,151 @@ #: ../data/vinagre.desktop.in.in.h:2 #: ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 -#: ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 -#: ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 +#: ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Pregledovalnik oddaljenih namizij" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Zahtevana je overitev" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Možnosti povezav" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Povezava" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Mapa" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Vmesnik" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Možnosti" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Nadrejena mapa" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "S katerim računalnikom se želite povezati?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Zgornja polja morajo biti izpolnjena" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Vsa polja zgoraj morajo biti izpolnjena" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Zahtevana je overitev" -#: ../data/vinagre.glade.h:10 -#: ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 +#: ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Zaznamki" -#: ../data/vinagre.glade.h:11 -#: ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Povezava" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Možnosti povezave" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Mapa" + +#: ../data/vinagre.ui.h:7 +#: ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 +#: ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Gostitelj:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Vmesnik" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Možnosti" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Nadrejena mapa" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Lastnosti" -#: ../data/vinagre.glade.h:13 -#: ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "Ali naj bodo prikazani zavihki tudi kadar je na voljo le ena povezava" - -#: ../data/vinagre.glade.h:14 -#: ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Ali naj bodo prikazane hitre tipke (tipkovne povezave)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "S katerim računalnikom se želite povezati?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Vedno pokaži zavihke" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Overi" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Celozaslonski način" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Gostitelj:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Ime:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Geslo:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokol:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Zapomni si poverilnico" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "Prilagajanje _velikosti" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Prikaži bližnjice menija" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Uporabniško ime:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Samo za _ogled" - -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "gostitelj ali gostitelj:zaslon ali gostitelj::vrata" +#: ../data/vinagre.schemas.in.in.h:1 +#: ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Dejavni vstavki" + +#: ../data/vinagre.schemas.in.in.h:2 +msgid "List of active plugins. It contains the \"Location\" of the active plugins. See the .vinagre-plugin file for obtaining the \"Location\" of a given plugin." +msgstr "Seznam dejavnih vstavkov. Seznam vsebuje \"Mesto\" dejavnih vstavkov. Več podrobnosti o \"Mestu\" je zabeleženih v datoteki .vinagre-plugin posameznega vstavka." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Največje število predmetov zgodovine v pogovornem oknu povezave." -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. Note that if they are enabled, those keys will be intercepted by the menu and will not be sent to the remote host." -msgstr "Izberite možnost \"false\", če želite onemogočiti hitre tipke menija. Izbrana možnost \"true\" jih omogoči. Opomba: Kadar so hitre tipke omogočene, bodo vedno uporabljene za meni in ne bodo delovale pri oddaljenih gostiteljih." +msgstr "Izberite možnost \"false\", če želite onemogočiti hitre tipke menija. Izbrana možnost \"true\" jih omogoči. Opomba: kadar so hitre tipke omogočene, bodo vedno uporabljene za meni in ne bodo delovale pri oddaljenih gostiteljih." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "Set to \"true\" to always show the tabs. Set to \"false\" to only show the tabs when there is more than one active connection." msgstr "Izberite možnost \"true\", če želite, da so zavihki vedno dejavni. Neizbrana možnost prikaže zavihke le, kadar je dejavnih več kot eden." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Določa največje število predmetov v spustnem meniju gostitelja." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" -msgstr "Upravljavec z \"vnc://\" naslovi URL" +msgstr "Upravljalnik z \"vnc://\" naslovi URL" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "When connecting to a host, the client can say to the server to leave other clients connected or to drop the existent connections. Set the value to true to share the desktop with the other clients." msgstr "Ob povezavi z gostiteljem, lahko odjemalec pusti druge odjemalce povezane s strežnikom ali pa prekine njihove povezave. Izbrana možnost omogoča souporabo namizja z drugimi odjemalci." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Ali naj ostanejo ostali odjemalci povezani" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "Ali naj bodo prikazani zavihki tudi kadar je na voljo le ena povezava" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Ali naj bodo prikazane hitre tipke (tipkovne povezave)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Datoteka (VNC) oddaljenega namizja" @@ -191,168 +191,360 @@ msgid "Remote Desktop Connection" msgstr "Povezava z oddaljenim namizjem" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Dostop do Unix/Linux terminalov" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 +#: ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Vrata:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Podpora SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "Neveljavna vrednost zastavice 'souporabe': %d. Vrednost mora biti 0 ali 1. Nastavitev je prezrta." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Omogoči prilagojen način" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Možnosti VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Prikaži možnosti VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Dostop do Unix/Linux, Windows in drugih sistemov." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Ni mogoče razčleniti datoteke." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Datoteka ni prava VNC datoteka: manjka skupina \"povezava\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Datoteka ni prava VNC datoteka: manjka ključ \"gostitelj\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Možnosti VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Samo za _ogled" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "Prilagajanje _velikosti" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Datoteke VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Ime namizja:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Mere:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Napaka med povezovanjem z gostiteljem." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Način overitve z gostiteljem %s ni podprt. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Overitev ni podprta" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 +#: ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Napaka med overjanjem" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Za dostop do računalnika je zahtevano uporabniško ime." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Za dostop do računalnika je zahtevano geslo." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "Prilagajanje _velikosti" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Prilagodi oddaljeni zaslon na velikost trenutnega okna" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Ne pošilja dejanj tipkovnice in miške" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Običajna velikost" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Prilagodi okno velikosti oddaljenega namizja" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 +#: ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Pošlji Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Pošlje Ctrl+Alt+Del ukaz oddaljenemu računalniku" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 +#: ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Prilagajanje velikosti" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 +#: ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Samo za branje" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable this feature." +msgstr "" +"Prilagajanja velikosti ni podprto pri tej namestitvi.\n" +"\n" +"Več podrobnosti o možnostih in načinu zagona si preberite v datoteki README." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Podpora VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Meni za hitri dostop do oddaljenih računalnikov" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Tovarna vstavka Vinagre" -#: ../src/vinagre-applet.c:271 -#: ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 +#: ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Ni mogoče zagnati programa vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Odpri pregledovalnik oddaljenih namizij" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Dostop do zaznamkov" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 +#: ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 +#: ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokol %s ni podprt." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Napaka med zaganjanjem zaznamkov: %s" -#: ../src/vinagre-bookmarks.c:344 -#: ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 -#: ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 -#: ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 +#: ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 +#: ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 +#: ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 +#: ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Neznana napaka" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" -msgstr "Napaka med zaganjanjem zaznamkov: Datoteka je videti prazna." +msgstr "Napaka med zaganjanjem zaznamkov: datoteka je videti prazna." -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "Napaka med zaganjanjem zaznamkov: Datoteka ni prava vinagre datoteka zaznamkov." +msgstr "Napaka med zaganjanjem zaznamkov: datoteka ni prava vinagre datoteka zaznamkov." -#: ../src/vinagre-bookmarks.c:420 -#: ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 +#: ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" -msgstr "Napaka med shranjevanjem zaznamkov: Napaka med ustvarjanjem XML zgradbe." +msgstr "Napaka med shranjevanjem zaznamkov: napaka med ustvarjanjem XML zgradbe." -#: ../src/vinagre-bookmarks.c:434 -#: ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 +#: ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" -msgstr "Napaka med shranjevanjem zaznamkov: Napaka med zaganjanjem XML zgradbe." +msgstr "Napaka med shranjevanjem zaznamkov: napaka med zaganjanjem XML zgradbe." -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" -msgstr "Napaka med shranjevanjem zaznamkov: Napaka med zaključevanjem XML zgradbe." +msgstr "Napaka med shranjevanjem zaznamkov: napaka med zaključevanjem XML zgradbe." -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Napaka med shranjevanjem zaznamkov: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" -msgstr "Napaka med prenosom zaznamkov: Napaka med ustrvarjanjem XML zgradbe" +msgstr "Napaka med prenosom zaznamkov: napaka med ustrvarjanjem XML zgradbe." -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" -msgstr "Napaka med prenosom zaznamkov: Napaka med zaganjanjem XML zgradbe" +msgstr "Napaka med prenosom zaznamkov: napaka med zaganjanjem XML zgradbe." -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" -msgstr "Napaka med prenosom zaznamkov: Napaka med zaključevanjem XML zgradbe" +msgstr "Napaka med prenosom zaznamkov: napaka med zaključevanjem XML zgradbe." -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Napaka med prenašanjem zaznamkov: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Napaka med prenašanjem zaznamkov: VNC vstavek ni dejaven" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Napaka pri ustvarjanju mape" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "Migrating the bookmarks file to the new format. This operation is only supposed to run once." msgstr "Prepis datoteke zaznamkov v novo obliko. Možnost se praviloma uporabi le enkrat." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Napaka med odpiranjem stare datoteke zaznamkov: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Prenos preklican." -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Ni mogoče odstraniti stare datoteke z zaznamki." -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Korenska mapa" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Neveljavno ime za to mapo" -#: ../src/vinagre-bookmarks-ui.c:89 -#: ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 +#: ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "The name \"%s\" is already used in this folder. Please use a different name." -msgstr "Ime \"%s\" je v tej mapi že uporabljeno. Prosim, uporabite drugačno ime." +msgstr "Ime \"%s\" je v tej mapi že uporabljeno. Prosim, uporabite drugo ime." -#: ../src/vinagre-bookmarks-ui.c:90 -#: ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 +#: ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" -msgstr "Neveljavno ime za ta predmet" +msgstr "Neveljavno ime predmeta" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Ali zares želite odstraniti %s iz zaznamkov?" +msgid "(Protocol: %s)" +msgstr "(Protokol: %s)" -#: ../src/vinagre-bookmarks-ui.c:297 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Ali zares želite odstraniti %s iz zaznamkov?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Ali naj se mapa odstrani?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Bodite pozorni, da bodo odstranjene tudi vse podrejene mape in njihove datoteke." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Odstrani predmet?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" -msgstr "Napaka med odstranjevanjem zaznamka: Vnosa ni mogoče najti." +msgstr "Napaka med odstranjevanjem zaznamka: vnosa ni mogoče najti." -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Nova mapa" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Izberite datoteko" -#: ../src/vinagre-commands.c:124 -#: ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Podprte oblike zapisov" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Ni podprtih datotek" + +#: ../vinagre/vinagre-commands.c:148 +msgid "None of the active plugins offer a supported file to be open. Activate some plugins and try again." +msgstr "Ni ustreznega vstavka za podporo odpiranju datoteke. Zagnati je treba ustrezne vstavke." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Datoteke, ki jih ni bilo mogoče odpreti:" @@ -360,66 +552,66 @@ msgstr[2] "Datoteki, ki ju ni bilo mogoče odpreti:" msgstr[3] "Datoteke, ki jih ni bilo mogoče odpreti:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 +#: ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Ni mogoče pridobiti dejavnega protokola v seznamu protokolov." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Napaka med shranjevanjem datoteke zgodovine: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Izbor VNC strežnika" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokol %s ni podprt." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Zapri oddaljeno namizje" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Ni mogoče odpreti datoteke." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Ni mogoče razčleniti datoteke." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Datoteke ne ustrezna nobenemu izmed dejavnih vstavkov." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "Neveljavna vrednost zastavice 'souporabe': %d. Vrednost mora biti 0 ali 1. Nastavitev je prezrta." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Ni mogoče najti naslova gostitelja v tej datoteki." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Neveljavno dejanje" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Podatki prejeti preko povleci&spusti so neveljavni." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Gostitelji v bližini" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Odpre .vnc datoteko" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "ime datoteke" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Odpri program v celozaslonskem načinu" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Ustvari novo vrhnje okno v obstoječi seji programa vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Odpri datoteko programa vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "ime datoteke" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[strežnik:vrata]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Prišlo je do naslednjih napak:" @@ -428,359 +620,382 @@ msgstr[3] "Prišlo je do naslednjih napak:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- VNC odjemalec za GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Pregledovalnik oddaljenih namizij" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "Zagon ukaza 'vinagre --help' izpiše celoten seznam ukazov, ki so na voljo." -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Napaka med razčlenjevanjem avahi imena gostitelja: %s\n" -#: ../src/vinagre-mdns.c:175 -#: ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Vstavek %s je že objavil brskalnik za storitev %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Napaka med dodajanjem mDNS brskalnika za storitev %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Napaka med brskanjem za gostitelji: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Napaka med zaganjanjem mDNS brskalnika: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Povezava z gostiteljem %s je prekinjena." +msgid "Connection to host %s was closed." +msgstr "Povezava z gostiteljem %s je prekinjena." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Povezava zaprta" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Neuspešen poskus overitve gostitelja %s." + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Overitev ni uspela" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Povezovanje ..." -#: ../src/vinagre-notebook.c:221 -#: ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 +#: ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Zapri povezavo" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Urejevalnik vstavkov" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Vstavek" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Omogočeno" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Nastavitve" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Priklopi" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Priklopi _vse" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Odklopi vse" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_O vstavku" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "_Nastavitve vstavka" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Ni mogoče zagnati upravljavca nastavitev." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Napaka med povezovanjem z gostiteljem." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Neuspešen poskus overitve z gostiteljem %s." - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Overitev ni uspela" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Način overitve z gostiteljem %s ni podprt. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Overitev ni podprta" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Zapusti celozaslonski način" -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Napaka med shranjevanjem nedavnih povezav" -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Napaka pri shranjevanju poverilnice v zbirko ključev." -#: ../src/vinagre-tab.c:747 -#: ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Napaka med overjanjem" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Za dostop do računalnika je zahtevano uporabniško ime." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Za dostop do računalnika je zahtevano geslo." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Pomanjšaj okno" - -#: ../src/vinagre-tab.c:906 -#: ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Prilagajanje velikosti" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Ni mogoče zajeti zaslonske slike povezave." -#: ../src/vinagre-tab.c:916 -#: ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Samo za branje" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Shrani zajeto sliko" -#. Machine menu -#: ../src/vinagre-tab.c:927 -#: ../src/vinagre-tab.c:928 -#: ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Zajemi zaslonsko sliko" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Zajeta slika %s" -#: ../src/vinagre-tab.c:936 -#: ../src/vinagre-tab.c:937 -#: ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Pošlji Ctrl-Alt-Del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Napaka med shranjevanjem zajete slike" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Ime namizja:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Ni mogoče pridobiti lastnosti storitve: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Vrata:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Ni mogoče ustvariti povezave: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Mere:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Ni mogoče sprejeti pretoka: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Ni mogoče zajeti zaslonske slike povezave." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Ni mogoče pridobiti imena stika: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "Zajeta slika %s" +msgid "Impossible to get the avatar: %s" +msgstr "Ni mogoče pridobiti sličice: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Shrani zajeto sliko" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s želi potrditi souporabo njegovega namizja." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable this feature." -msgstr "" -"Prilagajanja velikosti ni podprto pri tej namestitvi.\n" -"\n" -"Več podrobnosti o možnostih in načinu zagona si preberite v datoteki README." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Povabilo k souporabi namizja" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Računalnik" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Uredi" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "Pogled" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Zaznamki" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Povezava z oddaljenim računalnikom" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Odpri .VNC datoteko" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Izhod iz programa" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Uredi lastnosti programa" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Odpri zaznamek" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Povezava z izbranim računalnikom" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Uredi zaznamke" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Urejanje podrobnosti izbranega zaznamka" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Odstrani iz zaznamkov" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Odstranite trenutno izbrane povezave iz zaznamkov" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Nova mapa" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Ustvari novo mapo" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Vsebina" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Odpri priročnik programa Vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "O programu" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Orodna vrstica" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Prikaži ali skrij orodno vrstico" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Vrstica stanja" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Prikaži ali skrij statusno vrstico" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Bočni _pladenj" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Pokaži ali skrij bočni pladenj" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Zapri trenutno povezavo" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "Zapri _vse" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Zapri vse dejavne povezave" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "Dodaj med _zaznamke" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Dodaj trenutno povezavo med zaznamke" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Zajemi zaslonsko sliko" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Zajemi zaslonsko sliko dejavne povezave" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Pošlji Ctrl+Alt+Del dejavni povezavi" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Pogled trenutnega računalnika v celozaslonskem načinu" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Običajna velikost" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Prilagodi okno velikosti oddaljenega namizja" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "Prilagajanje _velikosti" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Prilagodi oddaljeni zaslon na velikost trenutnega okna" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "Samo za _branje" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Onemogoči miško in tipkovnico" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Orodna vrstica" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Prikaži ali skrij orodno vrstico" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Vrstica stanja" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Prikaži ali skrij statusno vrstico" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Bočni _pladenj" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Pokaži ali skrij bočni pladenj" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Prišlo je do napake:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Program Vinagre je VNC odjemalec za GNOME namizje" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Ni mogoče naložiti izgradne datoteke: %s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Program Vinagre je pregledovalnik oddaljenih namizi za namizje GNOME" + +#: ../vinagre/vinagre-utils.c:456 msgid "Vinagre 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 "Program Vinagre je prosti program; lahko ga izmenjujete in spreminjate pod pogoji GNU splošne javne licence kot je objavljena z Free Software Foundation; različica 2 in vse nadaljnje različice." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "Vinagre 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 "Uporaba in razširjanje programa Vinagre je prosto, vendar brez kakršnekoli garancije. Za več podrobnosti si oglejte GNU splošno javno licenco." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "You should have received a copy of the GNU General Public License along with this program. If not, see ." msgstr "Skupaj s programom bi morali dobiti tudi kopijo GNU splošne javne licence. V primeru, da je niste, si oglejte ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "Matej Urbančič " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Spletišče Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Ni mogoče združiti vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Nedavne povezave" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Odpri %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Pritisnite Ctrl+Alt za sprostitev kazalnika" - +#~ msgid "Connection" +#~ msgstr "Povezava" +#~ msgid "Folder" +#~ msgstr "Mapa" +#~ msgid "host or host:display or host::port" +#~ msgstr "gostitelj ali gostitelj:zaslon ali gostitelj::vrata" +#~ msgid "Supported formats" +#~ msgstr "Podprte oblike zapisov" +#~ msgid "Choose a VNC Server" +#~ msgstr "Izbor VNC strežnika" +#~ msgid "Could not find the host address in the file." +#~ msgstr "Ni mogoče najti naslova gostitelja v tej datoteki." +#~ msgid "Opens a .vnc file" +#~ msgstr "Odpre .vnc datoteko" +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- VNC odjemalec za GNOME" +#~ msgid "Minimize window" +#~ msgstr "Pomanjšaj okno" +#~ msgid "_Read only" +#~ msgstr "Samo za _branje" +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Pritisnite Ctrl+Alt za sprostitev kazalnika" #~ msgid "gtk-close" #~ msgstr "gtk-close" #~ msgid "" @@ -810,8 +1025,6 @@ #~ msgstr "Ali potrjujete odstranitev?" #~ msgid "Error while removing %s from bookmarks: %s" #~ msgstr "Napaka med odstranjevanjem %s iz zaznamkov: %s" -#~ msgid "_Port:" -#~ msgstr "_Vrata:" #~ msgid "Expected `%s' got `%s' for key %s" #~ msgstr "Pričakovan `%s' dobljen `%s' za ključ %s" #~ msgid "Press Ctrl+Alt to grab the cursor" diff -Nru vinagre-2.26.1/po/sr@latin.po vinagre-2.29.1/po/sr@latin.po --- vinagre-2.26.1/po/sr@latin.po 2008-09-22 13:24:26.000000000 +0100 +++ vinagre-2.29.1/po/sr@latin.po 2009-09-17 15:20:20.000000000 +0100 @@ -6,147 +6,195 @@ # This file is distributed under the same license as the vinagre package. # # Maintainer: Dušan Živojnov +# Translated on 2009-09-13 by: Branko Kokanović # msgid "" msgstr "" "Project-Id-Version: vinagre\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-20 14:02+0200\n" -"PO-Revision-Date: 2008-09-20 14:34+0100\n" -"Last-Translator: Goran Rakić \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=vinagre&component=general\n" +"POT-Creation-Date: 2009-09-13 01:50+0000\n" +"PO-Revision-Date: 2009-09-13 11:05+0200\n" +"Last-Translator: Branko Kokanović \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_O programu" -#: ../data/GNOME_VinagreApplet.xml.h:2 -#: ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "P_omoć" -#: ../data/vinagre.desktop.in.in.h:1 -#: ../data/vinagre-file.desktop.in.in.h:1 +#: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 msgid "Access remote desktops" msgstr "Pristupi udaljenom računaru" -#: ../data/vinagre.desktop.in.in.h:2 -#: ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 -#: ../src/vinagre-applet.c:222 -#: ../src/vinagre-applet.c:228 -#: ../src/vinagre-main.c:146 +#: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Pregled udaljenih radnih površina" -#: ../data/vinagre.glade.h:1 -msgid "Connection options" -msgstr "Opcije veze" - -#: ../data/vinagre.glade.h:2 -msgid "Editing a bookmark" -msgstr "Prepravljanje obeleživača" - -#: ../data/vinagre.glade.h:3 -msgid "Enter a name for this connection" -msgstr "Unesite ime za ovu vezu" - -#: ../data/vinagre.glade.h:4 -msgid "In order to connect on this machine, a password is required. Please supply it." -msgstr "Za pristup ovom računaru neophodna je šifra. Molim unesite je." - -#: ../data/vinagre.glade.h:5 -msgid "Which machine do you want to connect to?" -msgstr "Na koji računar želite da se povežete?" - -#: ../data/vinagre.glade.h:6 -msgid "Editing a bookmark" -msgstr "Prepravljanje obeleživača" - -#: ../data/vinagre.glade.h:7 -#: ../src/vinagre-fav.c:424 -#: ../src/vinagre-tab.c:864 +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Sva polja iznad su obavezna" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Prijava je obavezna" + +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 +msgid "Bookmarks" +msgstr "Obeleživači" + +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Veza" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Opcije veze" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Fascikla" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Računar:" -#: ../data/vinagre.glade.h:8 -msgid "Saving to bookmarks" -msgstr "Čuvam među obeleživače" - -#: ../data/vinagre.glade.h:9 -msgid "_Bookmark name:" -msgstr "_Ime obeleživača:" +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Sučelje" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Opcije" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Roditeljska fascikla" + +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "Postavke" + +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Na koji računar želite da se povežete?" + +#: ../data/vinagre.ui.h:13 +msgid "_Always show tabs" +msgstr "_Uvek prikazuj listove" + +#. This is a button label, in the authentication dialog +#: ../data/vinagre.ui.h:15 +msgid "_Authenticate" +msgstr "Prij_avi se" -#: ../data/vinagre.glade.h:10 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Ceo ekran" -#: ../data/vinagre.glade.h:11 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Računar:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Ime:" -#: ../data/vinagre.glade.h:13 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Šifra:" -#: ../data/vinagre.glade.h:14 -msgid "_Remember this password" -msgstr "_Zapamti ovu šifru" - -#: ../data/vinagre.glade.h:15 -msgid "_Scaling" -msgstr "_Razmera" +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokol:" + +#: ../data/vinagre.ui.h:21 +msgid "_Remember this credential" +msgstr "_Zapamti ove akreditive" + +#: ../data/vinagre.ui.h:22 +msgid "_Show menu shortcuts" +msgstr "_Prikaži prečice u meniju" + +#: ../data/vinagre.ui.h:23 +msgid "_Username:" +msgstr "_Korisničko ime:" + +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Pokrenuti dodaci" -#: ../data/vinagre.glade.h:16 -msgid "_View only" -msgstr "Samo _pregled" - -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:18 -msgid "host or host:display or host::port" -msgstr "računar ili računar:ekran ili računar::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Spisak pokrenutih dodataka. Sadrži „Lokaciju“ aktivnog dodatka. Pogledajte " +"Vinagerovu datoteku dodatka da biste saznali „Lokaciju“ željenog dodatka." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Maksimalan broj prethodnih stavki u prozorčetu za povezivanje" -#: ../data/vinagre.schemas.in.h:2 -msgid "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. Note that if they are enabled, those keys will be intercepted by the menu and will not be sent to the remote host." -msgstr "Ako je isključeno prečice menija će biti onemogućene. Ako su prečice omogućene program će prigrabiti te kombinacije tastera i neće ih poslati udaljenoj površi." - -#: ../data/vinagre.schemas.in.h:3 -msgid "Set to \"true\" to always show the tabs. Set to \"false\" to only show the tabs when there is more than one active connection." -msgstr "Ako je uključeno listovi će uvek biti prikazani. Isključite da prikažete listove samo kada postoji više aktivnih veza." +#: ../data/vinagre.schemas.in.in.h:4 +msgid "" +"Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " +"Note that if they are enabled, those keys will be intercepted by the menu " +"and will not be sent to the remote host." +msgstr "" +"Ako je isključeno prečice menija će biti onemogućene. Ako su prečice " +"omogućene program će prigrabiti te kombinacije tastera i neće ih poslati " +"udaljenoj površi." + +#: ../data/vinagre.schemas.in.in.h:5 +msgid "" +"Set to \"true\" to always show the tabs. Set to \"false\" to only show the " +"tabs when there is more than one active connection." +msgstr "" +"Ako je uključeno listovi će uvek biti prikazani. Isključite da prikažete " +"listove samo kada postoji više aktivnih veza." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Određuje maksimalan broj stavki u listi za unos imena računara. " -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Program za korišćenje URL-ova tipa \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 -msgid "When connecting to a host, the client can say to the server to leave other clients connected or to drop the existent connections. Set the value to true to share the desktop with the other clients." -msgstr "Pri povezivanju na računar, klijent može da naloži serveru da zadrži ili prekine vezu sa već povezanim klijentima. Uključite da omogućite deljenje kontrole sa drugim klijentima." +#: ../data/vinagre.schemas.in.in.h:8 +msgid "" +"When connecting to a host, the client can say to the server to leave other " +"clients connected or to drop the existent connections. Set the value to true " +"to share the desktop with the other clients." +msgstr "" +"Pri povezivanju na računar, klijent može da naloži serveru da zadrži ili " +"prekine vezu sa već povezanim klijentima. Uključite da omogućite deljenje " +"kontrole sa drugim klijentima." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Treba li zadržati prethodne veze ka drugim klijentima" -#: ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" msgstr "Treba li prikazati listove kada je samo jedna veza aktivna" -#: ../data/vinagre.schemas.in.h:9 +#: ../data/vinagre.schemas.in.in.h:11 msgid "Whether we should show the menu accelerators (shortcut keys)" msgstr "Treba li prikazati ubrzivače menija (prečice)" @@ -158,125 +206,436 @@ msgid "Remote Desktop Connection" msgstr "Veza ka udaljenoj radnoj površini" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Pristup UNIX/Linuks terminalima" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH podrška" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "Loša vrednost za „deljenu“ oznaku: %d. Treba biti 0 ili 1. Ignorišem." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Omogući režim razmere" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC opcije:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Prikaži VNC opcije" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Pristup UNIX/Linuks, Windows i ostalim mašinama." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Ne mogu da obradim datoteku." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Ovo nije VNC datoteka: Nedostaje grupa „connection“." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Ovo nije VNC datoteka: Nedostaje ključ „host“." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC opcije" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Samo _pregled" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Razmera" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC datoteke" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Ime radne površine:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimenzije:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Greška prilikom povezivanja sa računarom." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Metod prijave za računar %s nije podržan. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Metod prijave nije podržan" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Greška pri prijavljivanju" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Potrebno vam je korisničko ime da bi pristupili ovom računaru." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Potrebna vam je lozinka da bi pristupili ovom računaru." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "R_azmera" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Uklapa udaljeni ekran u veličinu prozora" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Ne šalje događaje miša i tastature" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Izvorna veličina" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Prilagođava prozor veličini udaljene radne površine" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Pošalji Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Šalje Ctrl+Alt+Del udaljenoj mašini" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Razmera" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Samo za pregled" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Razmera nije podržana u ovoj instalaciji.\n" +"\n" +"Pročitajte README datoteku (isporučuje su Vinager) da bi saznali kako da " +"omogućite ovu mogućnost." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC podrška" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Meni za brz pristup udaljenim računarima" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Fabrika vinager programčeta" -#: ../src/vinagre-applet.c:98 -#: ../src/vinagre-applet.c:144 -#, c-format -msgid "Could not run vinagre: %s" -msgstr "Ne mogu da pokrenem vinager: %s" +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 +msgid "Could not run vinagre:" +msgstr "Ne mogu da pokrenem preglednika udaljene radne površine:" -#: ../src/vinagre-applet.c:167 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Otvori preglednika udaljene radne površine" -#: ../src/vinagre-applet.c:229 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Pristupi obeleživačima" -#: ../src/vinagre-bookmarks.c:92 -msgid "Copying the bookmarks file to the new location. This operation is only supposed to run once." -msgstr "Umnožavam obeleživače na novu lokaciju. Ova operacija je predviđena da se obavi samo jednom." +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokol %s nije podržan." -#: ../src/vinagre-bookmarks.c:97 +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format -msgid "Error: %s" -msgstr "Greška: %s" +msgid "Error while initializing bookmarks: %s" +msgstr "Greška prilikom inicijalizovanja obeleživača: %s" + +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 +msgid "Unknown error" +msgstr "Javila se nepoznata greška" -#: ../src/vinagre-bookmarks.c:420 -msgid "Confirm removal?" -msgstr "Da li želite da uklonite?" +#: ../vinagre/vinagre-bookmarks.c:350 +msgid "Error while initializing bookmarks: The file seems to be empty" +msgstr "Greška prilikom inicijalizovanja obeleživača: Datoteka izgleda prazno" + +#: ../vinagre/vinagre-bookmarks.c:357 +msgid "" +"Error while initializing bookmarks: The file is not a vinagre bookmarks file" +msgstr "" +"Greška prilikom inicijalizovanja obeleživača: Datoteka nije u formatu u kome " +"se čuvaju obeleživači." + +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 +msgid "Error while saving bookmarks: Failed to create the XML structure" +msgstr "" +"Greška prilikom čuvanja obeleživača: Greška prilikom pravljenja XML strukture" + +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 +msgid "Error while saving bookmarks: Failed to initialize the XML structure" +msgstr "" +"Greška prilikom čuvanja obeleživača: Greška prilikom inicijalizacije XML " +"strukture" + +#: ../vinagre/vinagre-bookmarks.c:449 +msgid "Error while saving bookmarks: Failed to finalize the XML structure" +msgstr "" +"Greška prilikom čuvanja obeleživača: Greška prilikom dovršavanja XML strukture" -#: ../src/vinagre-bookmarks.c:423 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Da li ste sigurni da želite da uklonite %s iz obeleživača?" +msgid "Error while saving bookmarks: %s" +msgstr "Greška prilikom čuvanja obeleživača: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 +msgid "Error while migrating bookmarks: Failed to create the XML structure" +msgstr "" +"Greška prilikom prebacivanja obeleživača: Greška prilikom pravljenja XML " +"strukture" + +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 +msgid "Error while migrating bookmarks: Failed to initialize the XML structure" +msgstr "" +"Greška prilikom prebacivanja obeleživača: Greška prilikom inicijalizacije XML " +"strukture" + +#: ../vinagre/vinagre-bookmarks-migration.c:125 +msgid "Error while migrating bookmarks: Failed to finalize the XML structure" +msgstr "" +"Greška prilikom prebacivanja obeleživača: Greška prilikom dovršavanja XML " +"strukture" -#: ../src/vinagre-bookmarks.c:434 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format -msgid "Error while removing %s from bookmarks: %s" -msgstr "Javila se greška prilikom uklaljanja %s iz obeleživača: %s" +msgid "Error while migrating bookmarks: %s" +msgstr "Greška prilikom prebacivanja obeleživača: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Greška prilikom prebacivanja obeleživača: VNC dodatak nije aktiviran" -#: ../src/vinagre-bookmarks.c:501 +#: ../vinagre/vinagre-bookmarks-migration.c:238 +msgid "Failed to create the directory" +msgstr "Ne mogu da napravim fasciklu" + +#: ../vinagre/vinagre-bookmarks-migration.c:262 +msgid "" +"Migrating the bookmarks file to the new format. This operation is only " +"supposed to run once." +msgstr "" +"Prebacujem datoteku sa obeleživačima u novi format. Ova operacija je " +"predviđena da se obavi samo jednom." + +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format -msgid "Error while initializing bookmarks: %s" -msgstr "Javila se greška prilikom inicijalizovanja obeleživača: %s" +msgid "Error opening old bookmarks file: %s" +msgstr "Greška prilikom otvaranja datoteke sa obeleživačima: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 +msgid "Migration cancelled" +msgstr "Prebacivanje je otkazano" + +#: ../vinagre/vinagre-bookmarks-migration.c:280 +msgid "Could not remove the old bookmarks file" +msgstr "Ne mogu da uklonim staru datoteku sa obeleživačima" -#: ../src/vinagre-bookmarks.c:522 -#: ../src/vinagre-bookmarks.c:539 +#: ../vinagre/vinagre-bookmarks-tree.c:120 +msgid "Root Folder" +msgstr "Korena fascikla" + +#: ../vinagre/vinagre-bookmarks-ui.c:78 +msgid "Invalid name for this folder" +msgstr "Neispravno ime za ovu fasciklu" + +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "Error while saving bookmarks: %s" -msgstr "Javila se greška prilikom čuvanja obeleživača: %s" +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "Već je iskorišćeno ime „%s“ u ovoj fascikli, odaberite neko drugo." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "Neispravno ime za ovu stavku" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokol: %s)" -#: ../src/vinagre-commands.c:106 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Da li ste sigurni da želite da uklonite %s iz obeleživača?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 +msgid "Remove Folder?" +msgstr "Da uklonim fasciklu?" + +#: ../vinagre/vinagre-bookmarks-ui.c:315 +msgid "Notice that all its subfolders and items will be removed as well." +msgstr "" +"Primetite da će sve fascikle i sve stavke ispod ove fascikle takođe biti " +"uklonjene." + +#: ../vinagre/vinagre-bookmarks-ui.c:320 +msgid "Remove Item?" +msgstr "Da uklonim stavku?" + +#: ../vinagre/vinagre-bookmarks-ui.c:337 +msgid "Error removing bookmark: Entry not found" +msgstr "Greška prilikom brisanja obeleživača: Unos nije nađen" + +#: ../vinagre/vinagre-bookmarks-ui.c:354 +msgid "New Folder" +msgstr "Nova fascikla" + +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Izaberite datoteku" -#: ../src/vinagre-commands.c:117 -#: ../src/vinagre-tab.c:947 -msgid "Supported formats" -msgstr "Podržani formati" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Ne postoje nijedna podržana datoteka" -#: ../src/vinagre-commands.c:149 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Nijedan od aktivnih dodataka ne podržava otvaranje datoteke. Aktivirajte neke " +"dodatke i probajte ponovo." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Ne mogu da otvorim sledeću datoteku:" msgstr[1] "Ne mogu da otvorim sledeće datoteke:" msgstr[2] "Ne mogu da otvorim sledeće datoteke:" -#: ../src/vinagre-connect.c:172 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Ne mogu da uzmem aktivni protokol iz spiska protokola." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" -msgstr "Javila se greška prilikom čuvanja istorijata: %s" +msgstr "Greška prilikom čuvanja istorijata: %s" -#: ../src/vinagre-connect.c:183 -msgid "Choose a VNC Server" -msgstr "Izaberite VNC server" - -#: ../src/vinagre-connect.c:261 -#: ../src/vinagre-main.c:81 -#: ../src/vinagre-main.c:100 -#: ../src/vinagre-window.c:285 -msgid "Unknown error" -msgstr "Javila se nepoznata greška" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Odaberite udaljenu radnu površinu" -#: ../src/vinagre-connection.c:530 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokol %s nije podržan." +#: ../vinagre/vinagre-connection.c:627 +msgid "Could not open the file." +msgstr "Ne mogu da otvorim datoteku." -#: ../src/vinagre-fav.c:762 -msgid "Bookmarks" -msgstr "Obeleživači" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Nijedan dodatak nije prepoznao datoteku." + +#: ../vinagre/vinagre-fav.c:670 +msgid "Invalid operation" +msgstr "Neispravna operacija" + +#: ../vinagre/vinagre-fav.c:671 +msgid "Data received from drag&drop operation is invalid." +msgstr "Podaci primljeni iz operacije prevlačenja nisu ispravni." -#: ../src/vinagre-fav.c:807 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Računari u blizini" -#: ../src/vinagre-main.c:49 -msgid "Opens a .vnc file" -msgstr "Otvara datoteku sa ekstenzijom .vnc" - -#: ../src/vinagre-main.c:49 -msgid "filename" -msgstr "ime datoteke" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Otvara Vinager u režimu preko celog ekrana" -#: ../src/vinagre-main.c:52 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Pravi novi prozor u već pokrenutom programu" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Otvara datoteku koju Vinager prepozna" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "ime datoteke" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:111 -#: ../src/vinagre-window.c:284 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Javio se sledeći problem:" @@ -284,321 +643,385 @@ msgstr[2] "Javili su se sledeći problemi:" #. Setup command line options -#: ../src/vinagre-main.c:132 -msgid "- VNC Client for GNOME" -msgstr "- VNC klijent za GNOME" - -#: ../src/vinagre-main.c:141 -msgid "Run 'vinagre --help' to see a full list of available command line options" -msgstr "Pokrenite 'vinagre --help' ako želite da vidite potpunu listu dostupnih opcija" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Pregled udaljenih radnih površina" -#: ../src/vinagre-mdns.c:118 +#: ../vinagre/vinagre-main.c:193 +msgid "" +"Run 'vinagre --help' to see a full list of available command line options" +msgstr "" +"Pokrenite 'vinagre --help' ako želite da vidite potpunu listu dostupnih " +"opcija" + +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Ne mogu da razlučim avahi ime: %s\n" -#: ../src/vinagre-mdns.c:170 -#: ../src/vinagre-mdns.c:179 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Dodatak %s je već registrovao pregledača za uslugu %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Ne mogu da dodam mDNS pretraživač za uslugu %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Ne mogu da razgledam računar: %s\n" -#: ../src/vinagre-notebook.c:127 +#: ../vinagre/vinagre-mdns.c:300 #, c-format -msgid "Connection to host \"%s\" was closed." -msgstr "Veza sa računarom „%s“ je zatvorena." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Neuspelo pokretanje mDNS pretraživača: %s\n" -#: ../src/vinagre-notebook.c:153 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "Veza sa računarom %s je zatvorena." + +#: ../vinagre/vinagre-notebook.c:463 +msgid "Connection closed" +msgstr "Veza je zatvorena" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Prijava za računar %s nije uspela" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Prijava nije uspela" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Povezujem se..." -#: ../src/vinagre-notebook.c:180 -#: ../src/vinagre-tab.c:692 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Zatvori vezu" -#: ../src/vinagre-prefs.c:167 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Upravnik dodacima" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Dodatak" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Omogućen" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "P_odesi" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ktiviraj" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ak_tiviraj sve" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Deaktiviraj sve" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_O dodatku" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "P_odesi dodatak" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Ne mogu da inicijalizujem upravnika preferencija" -#: ../src/vinagre-tab.c:271 -msgid "Error connecting to host." -msgstr "Javila se greška prilikom povezivanja sa računarom." - -#: ../src/vinagre-tab.c:303 -#, c-format -msgid "Authentication to host \"%s\" has failed" -msgstr "Autentifikacija za računar \"%s\" nije uspela" - -#: ../src/vinagre-tab.c:331 -#, c-format -msgid "Authentication method to host \"%s\" is unsupported. (%u)" -msgstr "Metod autentifikacije za računar \"%s\" nije podržan. (%u)" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Napusti ceo ekran" -#: ../src/vinagre-tab.c:412 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." -msgstr "Javila se greška prilikom čuvanja nedavnih veza" +msgstr "Greška prilikom čuvanja nedavnih veza" -#: ../src/vinagre-tab.c:443 -msgid "Error saving the password on the keyring." -msgstr "Javila se greška prilikom čuvanja šifre u skladištu ključeva." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Greška prilikom čuvanja šifri u privesku ključeva." -#: ../src/vinagre-tab.c:706 -#: ../src/vinagre-tab.c:707 -msgid "Scaling" -msgstr "Razmera" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Ne mogu da uzmem snimak ekrana aktivne veze." -#: ../src/vinagre-tab.c:716 -#: ../src/vinagre-tab.c:717 -msgid "Read only" -msgstr "Samo za pregled" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Čuva snimak ekrana" -#. Machine menu -#: ../src/vinagre-tab.c:727 -#: ../src/vinagre-tab.c:728 -#: ../src/vinagre-ui.h:79 -msgid "Take screenshot" -msgstr "Snimi ekran" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Snimak ekrana %s" -#: ../src/vinagre-tab.c:736 -#: ../src/vinagre-tab.c:737 -#: ../src/vinagre-ui.h:82 -msgid "Send Ctrl-Alt-Del" -msgstr "Pošalji Ctrl-Alt-Del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Greška prilikom čuvanja snimka ekrana" -#: ../src/vinagre-tab.c:863 -msgid "Desktop Name:" -msgstr "Ime radne površine:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Ne mogu da preuzmem svojstvo servisa: %s" -#: ../src/vinagre-tab.c:865 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Ne mogu da napravim vezu: %s" -#: ../src/vinagre-tab.c:866 -msgid "Dimensions:" -msgstr "Dimenzije:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Ne mogu da prihvatitim kanal toka: %s" -#: ../src/vinagre-tab.c:933 +#: ../vinagre/vinagre-tube-handler.c:463 #, c-format -msgid "Screenshot of %s" -msgstr "Snimak ekrana %s" +msgid "Impossible to get the contact name: %s" +msgstr "Ne mogu da preuzmem ime kontakta: %s" -#: ../src/vinagre-tab.c:936 -msgid "Save Screenshot" -msgstr "Sačuvaj snimak ekrana" +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Ne mogu da preuzmem avatar: %s" -#: ../src/vinagre-tab.c:1000 -msgid "Scaling does not work properly on composited windows. Disable the visual effects and try again." -msgstr "Razmera ne radi ispravno u kompozitnim prozorima. Isključite vizuelne efekte i pokušajte ponovo." +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s želi da deli svoju radnu površinu sa vama." -#: ../src/vinagre-tab.c:1008 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable this feature." -msgstr "" -"Razmera nije podržana u ovoj instalaciji.\n" -"\n" -"Pročitajte README datoteku (isporučuje su Vinager) da bi saznali kako da omogućite ovu mogućnost." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Pozivnica za deljenje radne površine" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Računar" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Prepravi" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "P_regledaj" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Obeleživači" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" -msgstr "Poveži se na udaljeni računar" +msgstr "Povezuje se na udaljeni računar" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" -msgstr "Otvori .vnc datoteku" +msgstr "Otvara .vnc datoteku" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" -msgstr "Izađi iz programa" +msgstr "Izlazi iz programa" +#: ../vinagre/vinagre-ui.h:49 +msgid "Edit the application preferences" +msgstr "Menja postavke programa" + +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:48 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" -msgstr "_Otvori obeleživače" +msgstr "_Otvori obeleživač" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" -msgstr "Poveži se na ovaj računar" +msgstr "Povezuje se na ovaj računar" -#: ../src/vinagre-ui.h:50 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Prepravi obeleživač" -#: ../src/vinagre-ui.h:51 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" -msgstr "Prepravi detalje odabranih obeleživača" +msgstr "Prepravlja detalje odabranih obeleživača" -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Ukloni iz obeleživača" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" -msgstr "Ukloni trenutno odabranu vezu iz obeleživača" +msgstr "Uklanja trenutno odabranu vezu iz obeleživača" + +#: ../vinagre/vinagre-ui.h:62 +msgid "_New Folder" +msgstr "_Nova fascikla" + +#: ../vinagre/vinagre-ui.h:63 +msgid "Create a new folder" +msgstr "Pravi novu fasciklu" #. Help menu -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Sadržaj" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" -msgstr "Otvori korisničko uputstvo za vinager" +msgstr "Otvara korisničko uputstvo za Pregled udaljenih radnih površina" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "O ovom programu" -#: ../src/vinagre-ui.h:66 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Paleta alatki" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Prikazuje ili sakriva paletu alatki" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Statusna linija" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Prikazuje ili sakriva statusnu liniju" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Panel sa strane" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Prikazuje ili sakriva pano za sa strane" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" -msgstr "Zatvori trenutnu vezu" +msgstr "Zatvara trenutnu vezu" -#: ../src/vinagre-ui.h:67 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "Z_atvori sve" -#: ../src/vinagre-ui.h:68 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" -msgstr "Zatvori sve aktivne veze" +msgstr "Zatvara sve aktivne veze" #. Bookmarks menu -#: ../src/vinagre-ui.h:71 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Dodaj u obeleživače" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" -msgstr "Dodaj trenutnu vezu u obeleživače" +msgstr "Dodaje trenutnu vezu u obeleživače" -#: ../src/vinagre-ui.h:80 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Snimi ekran" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Uzima snimak ekrana trenutno aktivne veze" -#: ../src/vinagre-ui.h:83 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Pošalji Ctrl+Alt+Del tekućoj vezi" - -#: ../src/vinagre-ui.h:87 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" -msgstr "Pregledaj ovaj računar preko celog ekrana" - -#: ../src/vinagre-ui.h:92 -msgid "S_caling" -msgstr "R_azmera" +msgstr "Pregleda ovaj računar preko celog ekrana" -#: ../src/vinagre-ui.h:93 -msgid "Fit the remote screen into the current window size" -msgstr "Uklopi udaljeni ekran u veličinu prozora" - -#: ../src/vinagre-ui.h:95 -msgid "_Read only" -msgstr "_Samo pregled" - -#: ../src/vinagre-ui.h:96 -msgid "Disable mouse and keyboard" -msgstr "Onemogući miša i tastaturu" +#: ../vinagre/vinagre-utils.c:75 +msgid "An error has occurred:" +msgstr "Javila se sledeća greška:" -#: ../src/vinagre-ui.h:102 -msgid "_Toolbar" -msgstr "_Paleta alatki" - -#: ../src/vinagre-ui.h:103 -msgid "Show or hide the toolbar" -msgstr "Prikaži ili sakrij paletu alatki" - -#: ../src/vinagre-ui.h:106 -msgid "_Statusbar" -msgstr "_Statusna linija" - -#: ../src/vinagre-ui.h:107 -msgid "Show or hide the statusbar" -msgstr "Prikaži ili sakrij statusnu liniju" - -#: ../src/vinagre-ui.h:110 -msgid "Side _Panel" -msgstr "_Panel sa strane" - -#: ../src/vinagre-ui.h:111 -msgid "Show or hide the side panel" -msgstr "Prikaži ili sakrij pano za sa strane" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Ne mogu da otvorim datoteku izgradnje: %s" -#: ../src/vinagre-utils.c:423 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinager je Gnomov VNC klijent" +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinager je Gnomov pregledač udaljenih radnih površina" -#: ../src/vinagre-utils.c:426 -msgid "Vinagre 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 "Vinager je slobodan softver; možete ga prosleđivati drugima i/ili ga prepravljati pod uslovima GNU Opšte javne licence (GNU General Public License) koju objavljuje Fondacija slobodnog softvera (Free Software Foundation); i to verzije 2 ove licence ili, po vašem mišljenju, bilo koje novije verzije." +#: ../vinagre/vinagre-utils.c:456 +msgid "" +"Vinagre 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 "" +"Vinager je slobodan softver; možete ga prosleđivati drugima i/ili ga " +"prepravljati pod uslovima GNU Opšte javne licence (GNU General Public " +"License) koju objavljuje Fondacija slobodnog softvera (Free Software " +"Foundation); i to verzije 2 ove licence ili, po vašem mišljenju, bilo koje " +"novije verzije." -#: ../src/vinagre-utils.c:430 -msgid "Vinagre 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 "Vinager se distribuira u nadi da će biti koristan, ali NEMA NIKAKVIH GARANCIJA; čak ni implicitnih garancija za UPOTREBNU VREDNOST ili NAMENE U ODREĐENE SVRHE. Pogledajte Gnuovu Opštu javnu licencu ( GNU General Public License) za više informacija." +#: ../vinagre/vinagre-utils.c:460 +msgid "" +"Vinagre 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 "" +"Vinager se distribuira u nadi da će biti koristan, ali NEMA NIKAKVIH " +"GARANCIJA; čak ni implicitnih garancija za UPOTREBNU VREDNOST ili NAMENE U " +"ODREĐENE SVRHE. Pogledajte Gnuovu Opštu javnu licencu ( GNU General Public " +"License) za više informacija." -#: ../src/vinagre-utils.c:434 -msgid "You should have received a copy of the GNU General Public License along with this program. If not, see ." -msgstr "Trebalo bi da ste zajedno sa ovim programom primili i kopiju GNUOVE Opšte javne licence (GNU General Public License). Ako niste, pogledajte ." +#: ../vinagre/vinagre-utils.c:464 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"this program. If not, see ." +msgstr "" +"Trebalo bi da ste zajedno sa ovim programom primili i kopiju GNUOVE Opšte " +"javne licence (GNU General Public License). Ako niste, pogledajte ." -#: ../src/vinagre-utils.c:456 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Marko Uskoković \n" "Goran Rakić \n" +"Branko Kokanović \n" "\n" "Prevod.org — prevod na srpski jezik." -#: ../src/vinagre-utils.c:459 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Veb mesto projekta Vinager" -#: ../src/vinagre-window.c:422 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Ne mogu da spojim vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:450 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Nedavne veze" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:610 -#: ../src/vinagre-window.c:660 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" -msgstr "Otvori %s:%d" - -#: ../src/vinagre-window.c:809 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Pritisnite Ctrl+Alt da biste oslobodili pokazivač." - -#~ msgid "_Port:" -#~ msgstr "_Port:" -#~ msgid "Image" -#~ msgstr "Slika" -#~ msgid "Name" -#~ msgstr "Ime" -#~ msgid "Hide bookmarks" -#~ msgstr "Sakrij zabeleške" -#~ msgid "Expected `%s' got `%s' for key %s" -#~ msgstr "Očekivao sam `%s' a dobio sam `%s' za ključ %s" -#~ msgid "Press Ctrl+Alt to grab the cursor" -#~ msgstr "Pritisnite Ctrl+Alt da biste zarobili pokazivač." - +msgstr "Otvara %s:%d" diff -Nru vinagre-2.26.1/po/sr.po vinagre-2.29.1/po/sr.po --- vinagre-2.26.1/po/sr.po 2008-09-22 13:24:26.000000000 +0100 +++ vinagre-2.29.1/po/sr.po 2009-09-17 15:20:20.000000000 +0100 @@ -6,147 +6,195 @@ # This file is distributed under the same license as the vinagre package. # # Maintainer: Душан Живојнов +# Translated on 2009-09-13 by: Бранко Кокановић # msgid "" msgstr "" "Project-Id-Version: vinagre\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-20 14:02+0200\n" -"PO-Revision-Date: 2008-09-20 14:34+0100\n" -"Last-Translator: Горан Ракић \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=vinagre&component=general\n" +"POT-Creation-Date: 2009-09-13 01:50+0000\n" +"PO-Revision-Date: 2009-09-13 11:05+0200\n" +"Last-Translator: Бранко Кокановић \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_О програму" -#: ../data/GNOME_VinagreApplet.xml.h:2 -#: ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "П_омоћ" -#: ../data/vinagre.desktop.in.in.h:1 -#: ../data/vinagre-file.desktop.in.in.h:1 +#: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 msgid "Access remote desktops" msgstr "Приступи удаљеном рачунару" -#: ../data/vinagre.desktop.in.in.h:2 -#: ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 -#: ../src/vinagre-applet.c:222 -#: ../src/vinagre-applet.c:228 -#: ../src/vinagre-main.c:146 +#: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Преглед удаљених радних површина" -#: ../data/vinagre.glade.h:1 -msgid "Connection options" -msgstr "Опције везе" - -#: ../data/vinagre.glade.h:2 -msgid "Editing a bookmark" -msgstr "Преправљање обележивача" - -#: ../data/vinagre.glade.h:3 -msgid "Enter a name for this connection" -msgstr "Унесите име за ову везу" - -#: ../data/vinagre.glade.h:4 -msgid "In order to connect on this machine, a password is required. Please supply it." -msgstr "За приступ овом рачунару неопходна је шифра. Молим унесите је." - -#: ../data/vinagre.glade.h:5 -msgid "Which machine do you want to connect to?" -msgstr "На који рачунар желите да се повежете?" - -#: ../data/vinagre.glade.h:6 -msgid "Editing a bookmark" -msgstr "Преправљање обележивача" - -#: ../data/vinagre.glade.h:7 -#: ../src/vinagre-fav.c:424 -#: ../src/vinagre-tab.c:864 +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Сва поља изнад су обавезна" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Пријава је обавезна" + +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 +msgid "Bookmarks" +msgstr "Обележивачи" + +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Веза" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Опције везе" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Фасцикла" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Рачунар:" -#: ../data/vinagre.glade.h:8 -msgid "Saving to bookmarks" -msgstr "Чувам међу обележиваче" - -#: ../data/vinagre.glade.h:9 -msgid "_Bookmark name:" -msgstr "_Име обележивача:" +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Сучеље" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Опције" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Родитељска фасцикла" + +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "Поставке" + +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "На који рачунар желите да се повежете?" + +#: ../data/vinagre.ui.h:13 +msgid "_Always show tabs" +msgstr "_Увек приказуј листове" + +#. This is a button label, in the authentication dialog +#: ../data/vinagre.ui.h:15 +msgid "_Authenticate" +msgstr "Приј_ави се" -#: ../data/vinagre.glade.h:10 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Цео екран" -#: ../data/vinagre.glade.h:11 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Рачунар:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Име:" -#: ../data/vinagre.glade.h:13 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Шифра:" -#: ../data/vinagre.glade.h:14 -msgid "_Remember this password" -msgstr "_Запамти ову шифру" - -#: ../data/vinagre.glade.h:15 -msgid "_Scaling" -msgstr "_Размера" +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Протокол:" + +#: ../data/vinagre.ui.h:21 +msgid "_Remember this credential" +msgstr "_Запамти ове акредитиве" + +#: ../data/vinagre.ui.h:22 +msgid "_Show menu shortcuts" +msgstr "_Прикажи пречице у менију" + +#: ../data/vinagre.ui.h:23 +msgid "_Username:" +msgstr "_Корисничко име:" + +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Покренути додаци" -#: ../data/vinagre.glade.h:16 -msgid "_View only" -msgstr "Само _преглед" - -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:18 -msgid "host or host:display or host::port" -msgstr "рачунар или рачунар:екран или рачунар::порт" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Списак покренутих додатака. Садржи „Локацију“ активног додатка. Погледајте " +"Винагерову датотеку додатка да бисте сазнали „Локацију“ жељеног додатка." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Максималан број претходних ставки у прозорчету за повезивање" -#: ../data/vinagre.schemas.in.h:2 -msgid "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. Note that if they are enabled, those keys will be intercepted by the menu and will not be sent to the remote host." -msgstr "Ако је искључено пречице менија ће бити онемогућене. Ако су пречице омогућене програм ће приграбити те комбинације тастера и неће их послати удаљеној површи." - -#: ../data/vinagre.schemas.in.h:3 -msgid "Set to \"true\" to always show the tabs. Set to \"false\" to only show the tabs when there is more than one active connection." -msgstr "Ако је укључено листови ће увек бити приказани. Искључите да прикажете листове само када постоји више активних веза." +#: ../data/vinagre.schemas.in.in.h:4 +msgid "" +"Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " +"Note that if they are enabled, those keys will be intercepted by the menu " +"and will not be sent to the remote host." +msgstr "" +"Ако је искључено пречице менија ће бити онемогућене. Ако су пречице " +"омогућене програм ће приграбити те комбинације тастера и неће их послати " +"удаљеној површи." + +#: ../data/vinagre.schemas.in.in.h:5 +msgid "" +"Set to \"true\" to always show the tabs. Set to \"false\" to only show the " +"tabs when there is more than one active connection." +msgstr "" +"Ако је укључено листови ће увек бити приказани. Искључите да прикажете " +"листове само када постоји више активних веза." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Одређује максималан број ставки у листи за унос имена рачунара. " -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Програм за коришћење URL-ова типа \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 -msgid "When connecting to a host, the client can say to the server to leave other clients connected or to drop the existent connections. Set the value to true to share the desktop with the other clients." -msgstr "При повезивању на рачунар, клијент може да наложи серверу да задржи или прекине везу са већ повезаним клијентима. Укључите да омогућите дељење контроле са другим клијентима." +#: ../data/vinagre.schemas.in.in.h:8 +msgid "" +"When connecting to a host, the client can say to the server to leave other " +"clients connected or to drop the existent connections. Set the value to true " +"to share the desktop with the other clients." +msgstr "" +"При повезивању на рачунар, клијент може да наложи серверу да задржи или " +"прекине везу са већ повезаним клијентима. Укључите да омогућите дељење " +"контроле са другим клијентима." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Треба ли задржати претходне везе ка другим клијентима" -#: ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" msgstr "Треба ли приказати листове када је само једна веза активна" -#: ../data/vinagre.schemas.in.h:9 +#: ../data/vinagre.schemas.in.in.h:11 msgid "Whether we should show the menu accelerators (shortcut keys)" msgstr "Треба ли приказати убрзиваче менија (пречице)" @@ -158,125 +206,436 @@ msgid "Remote Desktop Connection" msgstr "Веза ка удаљеној радној површини" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Приступ UNIX/Линукс терминалима" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Порт:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH подршка" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "Лоша вредност за „дељену“ ознаку: %d. Треба бити 0 или 1. Игноришем." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Омогући режим размере" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC опције:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Прикажи VNC опције" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Приступ UNIX/Линукс, Windows и осталим машинама." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Не могу да обрадим датотеку." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Ово није VNC датотека: Недостаје група „connection“." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Ово није VNC датотека: Недостаје кључ „host“." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC опције" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Само _преглед" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Размера" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC датотеке" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Име радне површине:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Димензије:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Грешка приликом повезивања са рачунаром." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Метод пријаве за рачунар %s није подржан. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Метод пријаве није подржан" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Грешка при пријављивању" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Потребно вам је корисничко име да би приступили овом рачунару." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Потребна вам је лозинка да би приступили овом рачунару." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "Р_азмера" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Уклапа удаљени екран у величину прозора" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Не шаље догађаје миша и тастатуре" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Изворна величина" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Прилагођава прозор величини удаљене радне површине" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Пошаљи Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Шаље Ctrl+Alt+Del удаљеној машини" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Размера" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Само за преглед" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Размера није подржана у овој инсталацији.\n" +"\n" +"Прочитајте README датотеку (испоручује су Винагер) да би сазнали како да " +"омогућите ову могућност." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC подршка" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Мени за брз приступ удаљеним рачунарима" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Фабрика винагер програмчета" -#: ../src/vinagre-applet.c:98 -#: ../src/vinagre-applet.c:144 -#, c-format -msgid "Could not run vinagre: %s" -msgstr "Не могу да покренем винагер: %s" +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 +msgid "Could not run vinagre:" +msgstr "Не могу да покренем прегледника удаљене радне површине:" -#: ../src/vinagre-applet.c:167 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Отвори прегледника удаљене радне површине" -#: ../src/vinagre-applet.c:229 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Приступи обележивачима" -#: ../src/vinagre-bookmarks.c:92 -msgid "Copying the bookmarks file to the new location. This operation is only supposed to run once." -msgstr "Умножавам обележиваче на нову локацију. Ова операција је предвиђена да се обави само једном." +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Протокол %s није подржан." -#: ../src/vinagre-bookmarks.c:97 +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format -msgid "Error: %s" -msgstr "Грешка: %s" +msgid "Error while initializing bookmarks: %s" +msgstr "Грешка приликом иницијализовања обележивача: %s" + +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 +msgid "Unknown error" +msgstr "Јавила се непозната грешка" -#: ../src/vinagre-bookmarks.c:420 -msgid "Confirm removal?" -msgstr "Да ли желите да уклоните?" +#: ../vinagre/vinagre-bookmarks.c:350 +msgid "Error while initializing bookmarks: The file seems to be empty" +msgstr "Грешка приликом иницијализовања обележивача: Датотека изгледа празно" + +#: ../vinagre/vinagre-bookmarks.c:357 +msgid "" +"Error while initializing bookmarks: The file is not a vinagre bookmarks file" +msgstr "" +"Грешка приликом иницијализовања обележивача: Датотека није у формату у коме " +"се чувају обележивачи." + +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 +msgid "Error while saving bookmarks: Failed to create the XML structure" +msgstr "" +"Грешка приликом чувања обележивача: Грешка приликом прављења XML структуре" + +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 +msgid "Error while saving bookmarks: Failed to initialize the XML structure" +msgstr "" +"Грешка приликом чувања обележивача: Грешка приликом иницијализације XML " +"структуре" + +#: ../vinagre/vinagre-bookmarks.c:449 +msgid "Error while saving bookmarks: Failed to finalize the XML structure" +msgstr "" +"Грешка приликом чувања обележивача: Грешка приликом довршавања XML структуре" -#: ../src/vinagre-bookmarks.c:423 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Да ли сте сигурни да желите да уклоните %s из обележивача?" +msgid "Error while saving bookmarks: %s" +msgstr "Грешка приликом чувања обележивача: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 +msgid "Error while migrating bookmarks: Failed to create the XML structure" +msgstr "" +"Грешка приликом пребацивања обележивача: Грешка приликом прављења XML " +"структуре" + +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 +msgid "Error while migrating bookmarks: Failed to initialize the XML structure" +msgstr "" +"Грешка приликом пребацивања обележивача: Грешка приликом иницијализације XML " +"структуре" + +#: ../vinagre/vinagre-bookmarks-migration.c:125 +msgid "Error while migrating bookmarks: Failed to finalize the XML structure" +msgstr "" +"Грешка приликом пребацивања обележивача: Грешка приликом довршавања XML " +"структуре" -#: ../src/vinagre-bookmarks.c:434 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format -msgid "Error while removing %s from bookmarks: %s" -msgstr "Јавила се грешка приликом уклаљања %s из обележивача: %s" +msgid "Error while migrating bookmarks: %s" +msgstr "Грешка приликом пребацивања обележивача: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Грешка приликом пребацивања обележивача: VNC додатак није активиран" -#: ../src/vinagre-bookmarks.c:501 +#: ../vinagre/vinagre-bookmarks-migration.c:238 +msgid "Failed to create the directory" +msgstr "Не могу да направим фасциклу" + +#: ../vinagre/vinagre-bookmarks-migration.c:262 +msgid "" +"Migrating the bookmarks file to the new format. This operation is only " +"supposed to run once." +msgstr "" +"Пребацујем датотеку са обележивачима у нови формат. Ова операција је " +"предвиђена да се обави само једном." + +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format -msgid "Error while initializing bookmarks: %s" -msgstr "Јавила се грешка приликом иницијализовања обележивача: %s" +msgid "Error opening old bookmarks file: %s" +msgstr "Грешка приликом отварања датотеке са обележивачима: %s" + +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 +msgid "Migration cancelled" +msgstr "Пребацивање је отказано" + +#: ../vinagre/vinagre-bookmarks-migration.c:280 +msgid "Could not remove the old bookmarks file" +msgstr "Не могу да уклоним стару датотеку са обележивачима" -#: ../src/vinagre-bookmarks.c:522 -#: ../src/vinagre-bookmarks.c:539 +#: ../vinagre/vinagre-bookmarks-tree.c:120 +msgid "Root Folder" +msgstr "Корена фасцикла" + +#: ../vinagre/vinagre-bookmarks-ui.c:78 +msgid "Invalid name for this folder" +msgstr "Неисправно име за ову фасциклу" + +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "Error while saving bookmarks: %s" -msgstr "Јавила се грешка приликом чувања обележивача: %s" +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "Већ је искоришћено име „%s“ у овој фасцикли, одаберите неко друго." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "Неисправно име за ову ставку" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Протокол: %s)" -#: ../src/vinagre-commands.c:106 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Да ли сте сигурни да желите да уклоните %s из обележивача?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 +msgid "Remove Folder?" +msgstr "Да уклоним фасциклу?" + +#: ../vinagre/vinagre-bookmarks-ui.c:315 +msgid "Notice that all its subfolders and items will be removed as well." +msgstr "" +"Приметите да ће све фасцикле и све ставке испод ове фасцикле такође бити " +"уклоњене." + +#: ../vinagre/vinagre-bookmarks-ui.c:320 +msgid "Remove Item?" +msgstr "Да уклоним ставку?" + +#: ../vinagre/vinagre-bookmarks-ui.c:337 +msgid "Error removing bookmark: Entry not found" +msgstr "Грешка приликом брисања обележивача: Унос није нађен" + +#: ../vinagre/vinagre-bookmarks-ui.c:354 +msgid "New Folder" +msgstr "Нова фасцикла" + +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Изаберите датотеку" -#: ../src/vinagre-commands.c:117 -#: ../src/vinagre-tab.c:947 -msgid "Supported formats" -msgstr "Подржани формати" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Не постоје ниједна подржана датотека" -#: ../src/vinagre-commands.c:149 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Ниједан од активних додатака не подржава отварање датотеке. Активирајте неке " +"додатке и пробајте поново." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Не могу да отворим следећу датотеку:" msgstr[1] "Не могу да отворим следеће датотеке:" msgstr[2] "Не могу да отворим следеће датотеке:" -#: ../src/vinagre-connect.c:172 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Не могу да узмем активни протокол из списка протокола." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" -msgstr "Јавила се грешка приликом чувања историјата: %s" +msgstr "Грешка приликом чувања историјата: %s" -#: ../src/vinagre-connect.c:183 -msgid "Choose a VNC Server" -msgstr "Изаберите VNC сервер" - -#: ../src/vinagre-connect.c:261 -#: ../src/vinagre-main.c:81 -#: ../src/vinagre-main.c:100 -#: ../src/vinagre-window.c:285 -msgid "Unknown error" -msgstr "Јавила се непозната грешка" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Одаберите удаљену радну површину" -#: ../src/vinagre-connection.c:530 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Протокол %s није подржан." +#: ../vinagre/vinagre-connection.c:627 +msgid "Could not open the file." +msgstr "Не могу да отворим датотеку." -#: ../src/vinagre-fav.c:762 -msgid "Bookmarks" -msgstr "Обележивачи" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Ниједан додатак није препознао датотеку." + +#: ../vinagre/vinagre-fav.c:670 +msgid "Invalid operation" +msgstr "Неисправна операција" + +#: ../vinagre/vinagre-fav.c:671 +msgid "Data received from drag&drop operation is invalid." +msgstr "Подаци примљени из операције превлачења нису исправни." -#: ../src/vinagre-fav.c:807 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Рачунари у близини" -#: ../src/vinagre-main.c:49 -msgid "Opens a .vnc file" -msgstr "Отвара датотеку са екстензијом .vnc" - -#: ../src/vinagre-main.c:49 -msgid "filename" -msgstr "име датотеке" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Отвара Винагер у режиму преко целог екрана" -#: ../src/vinagre-main.c:52 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Прави нови прозор у већ покренутом програму" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Отвара датотеку коју Винагер препозна" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "име датотеке" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[сервер:порт]" -#: ../src/vinagre-main.c:111 -#: ../src/vinagre-window.c:284 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Јавио се следећи проблем:" @@ -284,321 +643,385 @@ msgstr[2] "Јавили су се следећи проблеми:" #. Setup command line options -#: ../src/vinagre-main.c:132 -msgid "- VNC Client for GNOME" -msgstr "- VNC клијент за GNOME" - -#: ../src/vinagre-main.c:141 -msgid "Run 'vinagre --help' to see a full list of available command line options" -msgstr "Покрените 'vinagre --help' ако желите да видите потпуну листу доступних опција" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Преглед удаљених радних површина" -#: ../src/vinagre-mdns.c:118 +#: ../vinagre/vinagre-main.c:193 +msgid "" +"Run 'vinagre --help' to see a full list of available command line options" +msgstr "" +"Покрените 'vinagre --help' ако желите да видите потпуну листу доступних " +"опција" + +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Не могу да разлучим авахи име: %s\n" -#: ../src/vinagre-mdns.c:170 -#: ../src/vinagre-mdns.c:179 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Додатак %s је већ регистровао прегледача за услугу %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Не могу да додам mDNS претраживач за услугу %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Не могу да разгледам рачунар: %s\n" -#: ../src/vinagre-notebook.c:127 +#: ../vinagre/vinagre-mdns.c:300 #, c-format -msgid "Connection to host \"%s\" was closed." -msgstr "Веза са рачунаром „%s“ је затворена." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Неуспело покретање mDNS претраживача: %s\n" -#: ../src/vinagre-notebook.c:153 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "Веза са рачунаром %s је затворена." + +#: ../vinagre/vinagre-notebook.c:463 +msgid "Connection closed" +msgstr "Веза је затворена" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Пријава за рачунар %s није успела" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Пријава није успела" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Повезујем се..." -#: ../src/vinagre-notebook.c:180 -#: ../src/vinagre-tab.c:692 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Затвори везу" -#: ../src/vinagre-prefs.c:167 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Управник додацима" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Додатак" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Омогућен" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "П_одеси" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "А_ктивирај" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ак_тивирај све" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Деактивирај све" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_О додатку" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "П_одеси додатак" + +#: ../vinagre/vinagre-prefs.c:227 msgid "Cannot initialize preferences manager." msgstr "Не могу да иницијализујем управника преференција" -#: ../src/vinagre-tab.c:271 -msgid "Error connecting to host." -msgstr "Јавила се грешка приликом повезивања са рачунаром." - -#: ../src/vinagre-tab.c:303 -#, c-format -msgid "Authentication to host \"%s\" has failed" -msgstr "Аутентификација за рачунар \"%s\" није успела" - -#: ../src/vinagre-tab.c:331 -#, c-format -msgid "Authentication method to host \"%s\" is unsupported. (%u)" -msgstr "Метод аутентификације за рачунар \"%s\" није подржан. (%u)" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Напусти цео екран" -#: ../src/vinagre-tab.c:412 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." -msgstr "Јавила се грешка приликом чувања недавних веза" +msgstr "Грешка приликом чувања недавних веза" -#: ../src/vinagre-tab.c:443 -msgid "Error saving the password on the keyring." -msgstr "Јавила се грешка приликом чувања шифре у складишту кључева." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Грешка приликом чувања шифри у привеску кључева." -#: ../src/vinagre-tab.c:706 -#: ../src/vinagre-tab.c:707 -msgid "Scaling" -msgstr "Размера" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Не могу да узмем снимак екрана активне везе." -#: ../src/vinagre-tab.c:716 -#: ../src/vinagre-tab.c:717 -msgid "Read only" -msgstr "Само за преглед" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Чува снимак екрана" -#. Machine menu -#: ../src/vinagre-tab.c:727 -#: ../src/vinagre-tab.c:728 -#: ../src/vinagre-ui.h:79 -msgid "Take screenshot" -msgstr "Сними екран" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Снимак екрана %s" -#: ../src/vinagre-tab.c:736 -#: ../src/vinagre-tab.c:737 -#: ../src/vinagre-ui.h:82 -msgid "Send Ctrl-Alt-Del" -msgstr "Пошаљи Ctrl-Alt-Del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Грешка приликом чувања снимка екрана" -#: ../src/vinagre-tab.c:863 -msgid "Desktop Name:" -msgstr "Име радне површине:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Не могу да преузмем својство сервиса: %s" -#: ../src/vinagre-tab.c:865 -msgid "Port:" -msgstr "Порт:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Не могу да направим везу: %s" -#: ../src/vinagre-tab.c:866 -msgid "Dimensions:" -msgstr "Димензије:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Не могу да прихватитим канал тока: %s" -#: ../src/vinagre-tab.c:933 +#: ../vinagre/vinagre-tube-handler.c:463 #, c-format -msgid "Screenshot of %s" -msgstr "Снимак екрана %s" +msgid "Impossible to get the contact name: %s" +msgstr "Не могу да преузмем име контакта: %s" -#: ../src/vinagre-tab.c:936 -msgid "Save Screenshot" -msgstr "Сачувај снимак екрана" +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Не могу да преузмем аватар: %s" -#: ../src/vinagre-tab.c:1000 -msgid "Scaling does not work properly on composited windows. Disable the visual effects and try again." -msgstr "Размера не ради исправно у композитним прозорима. Искључите визуелне ефекте и покушајте поново." +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s жели да дели своју радну површину са вама." -#: ../src/vinagre-tab.c:1008 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable this feature." -msgstr "" -"Размера није подржана у овој инсталацији.\n" -"\n" -"Прочитајте README датотеку (испоручује су Винагер) да би сазнали како да омогућите ову могућност." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Позивница за дељење радне површине" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Рачунар" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Преправи" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "П_регледај" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Обележивачи" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" -msgstr "Повежи се на удаљени рачунар" +msgstr "Повезује се на удаљени рачунар" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" -msgstr "Отвори .vnc датотеку" +msgstr "Отвара .vnc датотеку" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" -msgstr "Изађи из програма" +msgstr "Излази из програма" +#: ../vinagre/vinagre-ui.h:49 +msgid "Edit the application preferences" +msgstr "Мења поставке програма" + +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:48 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" -msgstr "_Отвори обележиваче" +msgstr "_Отвори обележивач" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" -msgstr "Повежи се на овај рачунар" +msgstr "Повезује се на овај рачунар" -#: ../src/vinagre-ui.h:50 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Преправи обележивач" -#: ../src/vinagre-ui.h:51 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" -msgstr "Преправи детаље одабраних обележивача" +msgstr "Преправља детаље одабраних обележивача" -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Уклони из обележивача" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" -msgstr "Уклони тренутно одабрану везу из обележивача" +msgstr "Уклања тренутно одабрану везу из обележивача" + +#: ../vinagre/vinagre-ui.h:62 +msgid "_New Folder" +msgstr "_Нова фасцикла" + +#: ../vinagre/vinagre-ui.h:63 +msgid "Create a new folder" +msgstr "Прави нову фасциклу" #. Help menu -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Садржај" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" -msgstr "Отвори корисничко упутство за винагер" +msgstr "Отвара корисничко упутство за Преглед удаљених радних површина" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "О овом програму" -#: ../src/vinagre-ui.h:66 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Палета алатки" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Приказује или сакрива палету алатки" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Статусна линија" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Приказује или сакрива статусну линију" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "_Панел са стране" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Приказује или сакрива пано за са стране" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" -msgstr "Затвори тренутну везу" +msgstr "Затвара тренутну везу" -#: ../src/vinagre-ui.h:67 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "З_атвори све" -#: ../src/vinagre-ui.h:68 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" -msgstr "Затвори све активне везе" +msgstr "Затвара све активне везе" #. Bookmarks menu -#: ../src/vinagre-ui.h:71 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Додај у обележиваче" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" -msgstr "Додај тренутну везу у обележиваче" +msgstr "Додаје тренутну везу у обележиваче" -#: ../src/vinagre-ui.h:80 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Сними екран" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Узима снимак екрана тренутно активне везе" -#: ../src/vinagre-ui.h:83 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Пошаљи Ctrl+Alt+Del текућој вези" - -#: ../src/vinagre-ui.h:87 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" -msgstr "Прегледај овај рачунар преко целог екрана" - -#: ../src/vinagre-ui.h:92 -msgid "S_caling" -msgstr "Р_азмера" +msgstr "Прегледа овај рачунар преко целог екрана" -#: ../src/vinagre-ui.h:93 -msgid "Fit the remote screen into the current window size" -msgstr "Уклопи удаљени екран у величину прозора" - -#: ../src/vinagre-ui.h:95 -msgid "_Read only" -msgstr "_Само преглед" - -#: ../src/vinagre-ui.h:96 -msgid "Disable mouse and keyboard" -msgstr "Онемогући миша и тастатуру" +#: ../vinagre/vinagre-utils.c:75 +msgid "An error has occurred:" +msgstr "Јавила се следећа грешка:" -#: ../src/vinagre-ui.h:102 -msgid "_Toolbar" -msgstr "_Палета алатки" - -#: ../src/vinagre-ui.h:103 -msgid "Show or hide the toolbar" -msgstr "Прикажи или сакриј палету алатки" - -#: ../src/vinagre-ui.h:106 -msgid "_Statusbar" -msgstr "_Статусна линија" - -#: ../src/vinagre-ui.h:107 -msgid "Show or hide the statusbar" -msgstr "Прикажи или сакриј статусну линију" - -#: ../src/vinagre-ui.h:110 -msgid "Side _Panel" -msgstr "_Панел са стране" - -#: ../src/vinagre-ui.h:111 -msgid "Show or hide the side panel" -msgstr "Прикажи или сакриј пано за са стране" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Не могу да отворим датотеку изградње: %s" -#: ../src/vinagre-utils.c:423 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Винагер је Гномов ВНЦ клијент" +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Винагер је Гномов прегледач удаљених радних површина" -#: ../src/vinagre-utils.c:426 -msgid "Vinagre 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 "Винагер је слободан софтвер; можете га прослеђивати другима и/или га преправљати под условима ГНУ Опште јавне лиценце (GNU General Public License) коју објављује Фондација слободног софтвера (Free Software Foundation); и то верзије 2 ове лиценце или, по вашем мишљењу, било које новије верзије." +#: ../vinagre/vinagre-utils.c:456 +msgid "" +"Vinagre 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 "" +"Винагер је слободан софтвер; можете га прослеђивати другима и/или га " +"преправљати под условима ГНУ Опште јавне лиценце (GNU General Public " +"License) коју објављује Фондација слободног софтвера (Free Software " +"Foundation); и то верзије 2 ове лиценце или, по вашем мишљењу, било које " +"новије верзије." -#: ../src/vinagre-utils.c:430 -msgid "Vinagre 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 "Винагер се дистрибуира у нади да ће бити користан, али НЕМА НИКАКВИХ ГАРАНЦИЈА; чак ни имплицитних гаранција за УПОТРЕБНУ ВРЕДНОСТ или НАМЕНЕ У ОДРЕЂЕНЕ СВРХЕ. Погледајте Гнуову Општу јавну лиценцу ( GNU General Public Licensе) за више информација." +#: ../vinagre/vinagre-utils.c:460 +msgid "" +"Vinagre 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 "" +"Винагер се дистрибуира у нади да ће бити користан, али НЕМА НИКАКВИХ " +"ГАРАНЦИЈА; чак ни имплицитних гаранција за УПОТРЕБНУ ВРЕДНОСТ или НАМЕНЕ У " +"ОДРЕЂЕНЕ СВРХЕ. Погледајте Гнуову Општу јавну лиценцу ( GNU General Public " +"Licensе) за више информација." -#: ../src/vinagre-utils.c:434 -msgid "You should have received a copy of the GNU General Public License along with this program. If not, see ." -msgstr "Требало би да сте заједно са овим програмом примили и копију ГНУОВЕ Опште јавне лиценце (GNU General Public License). Ако нисте, погледајте ." +#: ../vinagre/vinagre-utils.c:464 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"this program. If not, see ." +msgstr "" +"Требало би да сте заједно са овим програмом примили и копију ГНУОВЕ Опште " +"јавне лиценце (GNU General Public License). Ако нисте, погледајте ." -#: ../src/vinagre-utils.c:456 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Марко Ускоковић \n" "Горан Ракић \n" +"Бранко Кокановић \n" "\n" "Превод.орг — превод на српски језик." -#: ../src/vinagre-utils.c:459 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Веб место пројекта Винагер" -#: ../src/vinagre-window.c:422 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Не могу да спојим vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:450 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Недавне везе" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:610 -#: ../src/vinagre-window.c:660 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" -msgstr "Отвори %s:%d" - -#: ../src/vinagre-window.c:809 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Притисните Ctrl+Alt да бисте ослободили показивач." - -#~ msgid "_Port:" -#~ msgstr "_Порт:" -#~ msgid "Image" -#~ msgstr "Слика" -#~ msgid "Name" -#~ msgstr "Име" -#~ msgid "Hide bookmarks" -#~ msgstr "Сакриј забелешке" -#~ msgid "Expected `%s' got `%s' for key %s" -#~ msgstr "Очекивао сам `%s' а добио сам `%s' за кључ %s" -#~ msgid "Press Ctrl+Alt to grab the cursor" -#~ msgstr "Притисните Ctrl+Alt да бисте заробили показивач." - +msgstr "Отвaрa %s:%d" diff -Nru vinagre-2.26.1/po/sv.po vinagre-2.29.1/po/sv.po --- vinagre-2.26.1/po/sv.po 2009-03-20 23:30:04.000000000 +0000 +++ vinagre-2.29.1/po/sv.po 2009-08-22 14:29:39.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: vinagre\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-20 22:35+0100\n" -"PO-Revision-Date: 2009-03-20 22:36+0100\n" +"POT-Creation-Date: 2009-08-21 10:17+0200\n" +"PO-Revision-Date: 2009-08-21 10:18+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -17,11 +17,12 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Om" #: ../data/GNOME_VinagreApplet.xml.h:2 -#: ../src/vinagre-ui.h:37 +#: ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Hjälp" @@ -32,152 +33,151 @@ #: ../data/vinagre.desktop.in.in.h:2 #: ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 -#: ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 -#: ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 +#: ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Fjärrskrivbordsklient" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Autentisering krävs" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Anslutningsalternativ" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Anslutning" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Mapp" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Gränssnitt" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Alternativ" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Föräldramapp" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Vilken dator vill du ansluta till?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Alla fält ovan är obligatoriska" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Alla fält ovan är obligatoriska" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Autentisering krävs" -#: ../data/vinagre.glade.h:10 -#: ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 +#: ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Bokmärken" -#: ../data/vinagre.glade.h:11 -#: ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Anslutning" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Anslutningsalternativ" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Mapp" + +#: ../data/vinagre.ui.h:7 +#: ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 +#: ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Värd:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Gränssnitt" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Alternativ" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Föräldramapp" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Inställningar" -#: ../data/vinagre.glade.h:13 -#: ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "Huruvida vi ska visa flikar även om det endast finns en aktiv anslutning" - -#: ../data/vinagre.glade.h:14 -#: ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Huruvida vi ska visa menysnabbtangenter (genvägstangenter)" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Vilken dator vill du ansluta till?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "Visa _alltid flikar" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Autentisera" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Helskärm" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Värd:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Namn:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Lösenord:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokoll:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Kom ihåg denna inloggningsuppgift" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Skalning" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Visa menygenvägar" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Användarnamn:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Visa endast" - -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "värd eller värd:display eller värd::port" +#: ../data/vinagre.schemas.in.in.h:1 +#: ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Aktiva insticksmoduler" + +#: ../data/vinagre.schemas.in.in.h:2 +msgid "List of active plugins. It contains the \"Location\" of the active plugins. See the .vinagre-plugin file for obtaining the \"Location\" of a given plugin." +msgstr "Lista över aktiva insticksmoduler. Den innehåller \"Plats\" för de aktiva insticksmodulerna. Se filen .vinagre-plugin för att ta reda på \"Plats\" för en angiven insticksmodul." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Maximalt antal historikobjekt i anslutningsdialogen" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. Note that if they are enabled, those keys will be intercepted by the menu and will not be sent to the remote host." msgstr "Ställ in till \"false\" för att inaktivera menygenvägar. Ställ in till \"true\" för att aktivera dem. Observera att om de är aktiverade så kommer dessa tangenter att fångas upp av menyn och kommer inte att skickas till fjärrdatorn." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "Set to \"true\" to always show the tabs. Set to \"false\" to only show the tabs when there is more than one active connection." msgstr "Ställ in till \"true\" för att alltid visa flikarna. Ställ in till \"false\" för att endast visa flikarna när det finns fler än en aktiv anslutning." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Anger maximalt antal värdobjekt i rullgardinslistan." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Hanteraren för url:er av typen \"vnc://\"" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "When connecting to a host, the client can say to the server to leave other clients connected or to drop the existent connections. Set the value to true to share the desktop with the other clients." msgstr "Vid anslutning till en värd kan klienten säga till servern att lämna andra klienter anslutna eller att bryta de befintliga anslutningarna. Ställ in värdet till sant för att dela skrivbordet med andra klienter." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Huruvida vi ska lämna andra klienter anslutna" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "Huruvida vi ska visa flikar även om det endast finns en aktiv anslutning" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Huruvida vi ska visa menysnabbtangenter (genvägstangenter)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Fjärrskrivbordsfil (VNC)" @@ -186,566 +186,772 @@ msgid "Remote Desktop Connection" msgstr "Fjärrskrivbordsanslutning" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Kom åt Unix/Linux-terminaler" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 +#: ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH-stöd" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "Felaktigt värde för \"shared\"-flagga: %d. Det ska vara 0 eller 1. Ignorerar det." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Aktivera skalat läge" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC-alternativ:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Visa VNC-alternativ" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Kom åt Unix/Linux, Windows och andra datorer." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Kunde inte tolka filen." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Filen är inte en VNC-fil: Saknar gruppen \"connection\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Filen är inte en VNC-fil: Nyckeln \"host\" saknas." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC-alternativ" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Visa endast" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Skalning" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC-filer" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Skrivbordsnamn:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Dimensioner:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Fel vid anslutning till värden." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Autentiseringsmetoden mot värden %s stöds inte. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Autentisering stöds inte" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 +#: ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Autentiseringsfel" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Ett användarnamn krävs för att komma åt denna dator." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Ett lösenord krävs för att komma åt denna dator." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "Ska_lning" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Passar in fjärrskärmen i den aktuella fönsterstorleken" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Skickar inte mus- och tangentbordshändelser" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Ursprunglig storlek" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Justerar fönstret till storleken för fjärrskrivbordet" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 +#: ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Skicka Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Skickar Ctrl+Alt+Del till fjärrdatorn" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 +#: ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Skalning" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 +#: ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Skrivskyddad" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable this feature." +msgstr "" +"Skalning stöds inte för denna installation.\n" +"\n" +"Läs filen README (kommer med Vinagre) för information om hur man aktiverar denna funktion." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC-stöd" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "En meny för att snabbt komma åt fjärrdatorer" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Panelprogramsfabrik för Vinagre" -#: ../src/vinagre-applet.c:271 -#: ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 +#: ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Kunde inte köra vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Öppna fjärrskrivbordsklient" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Kom åt dina bokmärken" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 +#: ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 +#: ../vinagre/vinagre-tube-handler.c:256 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokollet %s stöds inte." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Fel vid initiering av bokmärken: %s" -#: ../src/vinagre-bookmarks.c:344 -#: ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 -#: ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 -#: ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 +#: ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 +#: ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 +#: ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 +#: ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Okänt fel" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Fel vid initiering av bokmärken: Filen verkar vara tom" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "Fel vid initiering av bokmärken: Filen är inte en bokmärkesfil för vinagre" -#: ../src/vinagre-bookmarks.c:420 -#: ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 +#: ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Fel vid sparande av bokmärken: Misslyckades med att skapa XML-strukturen" -#: ../src/vinagre-bookmarks.c:434 -#: ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 +#: ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Fel vid sparande av bokmärken: Misslyckades med att initiera XML-strukturen" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Fel vid sparande av bokmärken: Misslyckades med att färdigställa XML-strukturen" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Fel när bokmärken sparades: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Fel vid migrering av bokmärken: Misslyckades med att skapa XML-strukturen" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Fel vid migrering av bokmärken: Misslyckades med att initiera XML-strukturen" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Fel vid migrering av bokmärken: Misslyckades med att färdigställa XML-strukturen" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Fel vid migrering av bokmärken: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Fel vid migrering av bokmärken: VNC-insticksmodulen är inte aktiverad" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Misslyckades med att skapa katalogen" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "Migrating the bookmarks file to the new format. This operation is only supposed to run once." msgstr "Migrerar bokmärkesfilen till det nya formatet. Denna åtgärd är endast tänkt att köras en gång." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Fel vid öppning av gammal bokmärkesfil: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Migreringen avbröts" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Kunde inte ta bort den gamla bokmärkesfilen" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Rotmapp" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Ogiltigt namn för denna mapp" -#: ../src/vinagre-bookmarks-ui.c:89 -#: ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 +#: ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "The name \"%s\" is already used in this folder. Please use a different name." msgstr "Namnet \"%s\" används redan i denna mapp. Använd ett annat namn." -#: ../src/vinagre-bookmarks-ui.c:90 -#: ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 +#: ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Ogiltigt namn för detta objekt" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokoll: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Är du säker på att du vill ta bort %s från dina bokmärken?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Är du säker på att du vill ta bort %s från dina bokmärken?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Ta bort mapp?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Observera att alla dess undermappar och objekt även kommer att tas bort." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Ta bort objekt?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Fel vid borttagning av bokmärke: Posten hittades inte" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Ny mapp" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Välj filen" -#: ../src/vinagre-commands.c:124 -#: ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Format som stöds" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Det finns inga filer som stöds" + +#: ../vinagre/vinagre-commands.c:148 +msgid "None of the active plugins offer a supported file to be open. Activate some plugins and try again." +msgstr "Inga av de aktiva insticksmodulerna erbjöd en fil som stöds att öppnas. Aktivera ytterligare insticksmoduler och försök igen." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Följande fil kunde inte öppnas:" msgstr[1] "Följande filer kunde inte öppnas:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 +#: ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Kunde inte få aktiva protokollet i protokollistan." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Fel när historikfil sparades: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Välj en VNC-server" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Välj ett fjärrskrivbord" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokollet %s stöds inte." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Kunde inte öppna filen." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Kunde inte tolka filen." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "Felaktigt värde för \"shared\"-flagga: %d. Det ska vara 0 eller 1. Ignorerar det." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Kunde inte hitta värdadressen i filen." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Filen kändes inte igen av någon av insticksmodulerna." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Ogiltig åtgärd" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Data som togs emot från dra&släpp-åtgärd är ogiltig." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Närliggande värdar" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Öppnar en .vnc-fil" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Öppna vinagre i helskärmsläge" -#: ../src/vinagre-main.c:53 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 +msgid "Create a new toplevel window in an existing instance of vinagre" +msgstr "Skapa ett nytt toppnivåfönster i en befintlig instans av Vinagre" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Öppna en fil som känns igen av vinagre" + +#: ../vinagre/vinagre-main.c:70 msgid "filename" msgstr "filnamn" -#: ../src/vinagre-main.c:56 -msgid "Create a new toplevel window in an existing instance of vinagre" -msgstr "Skapa ett nytt toppnivåsfönster i en befintlig instans av Vinagre" - -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Följande fel har inträffat:" msgstr[1] "Följande fel har inträffat:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- VNC-klient för GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Fjärrskrivbordsklient" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" msgstr "Kör \"vinagre --help\" för att se en fullständig lista över tillgängliga kommandoradsflaggor" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Misslyckades med att slå upp avahi-värdnamn: %s\n" -#: ../src/vinagre-mdns.c:175 -#: ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Insticksmodulen %s har redan registrerat en bläddrare för tjänsten %s." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Misslyckades med att lägga till mDNS-bläddrare för tjänsten %s." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Misslyckades med att söka efter värdar: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Misslyckades med att initiera mDNS-bläddrare: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "Anslutningen till värden %s stängdes." +msgid "Connection to host %s was closed." +msgstr "Anslutningen till värden %s stängdes." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Anslutningen stängdes" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Autentisering mot värden %s misslyckades" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Autentisering misslyckades" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Ansluter..." -#: ../src/vinagre-notebook.c:221 -#: ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 +#: ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Stäng anslutning" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Instickshanterare" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Insticksmodul" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Aktiverad" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "K_onfigurera" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "A_ktivera" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Ak_tivera alla" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Inaktivera alla" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Om insticksmodulen" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "K_onfigurera insticksmodulen" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Kan inte initiera inställningshanteraren." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Fel vid anslutning till värden." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Autentisering mot värden %s misslyckades" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Autentisering misslyckades" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Autentiseringsmetod mot värden %s stöds inte. (%u)" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Lämna helskärmsläge" -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Autentisering stöds inte" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Fel när senaste anslutningen sparades." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Fel när inloggningsuppgifter sparades i nyckelringen." -#: ../src/vinagre-tab.c:747 -#: ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Autentiseringsfel" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Ett användarnamn krävs för att komma åt denna dator." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Ett lösenord krävs för att komma åt denna dator." +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Kunde inte få en skärmbild på anslutningen." -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Minimera fönster" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Spara skärmbild" -#: ../src/vinagre-tab.c:906 -#: ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Skalning" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Skärmbild för %s" -#: ../src/vinagre-tab.c:916 -#: ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Skrivskyddad" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Fel vid sparandet av skärmbild" -#. Machine menu -#: ../src/vinagre-tab.c:927 -#: ../src/vinagre-tab.c:928 -#: ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Ta skärmbild" +#: ../vinagre/vinagre-tube-handler.c:232 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Omöjligt att få egenskap för tjänsten: %s" -#: ../src/vinagre-tab.c:936 -#: ../src/vinagre-tab.c:937 -#: ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Skicka Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:289 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Omöjligt att skapa anslutningen: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Skrivbordsnamn:" +#: ../vinagre/vinagre-tube-handler.c:328 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Omöjligt att acceptera strömtuben: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:404 +#, c-format +msgid "Failed to request name: %s" +msgstr "Misslyckades med att begära namnet: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Dimensioner:" +#: ../vinagre/vinagre-tube-handler.c:405 +msgid "No error given" +msgstr "Inget fel angavs" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Kunde inte få en skärmbild på anslutningen." +#: ../vinagre/vinagre-tube-handler.c:482 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Omöjligt att få kontaktens namn: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:517 #, c-format -msgid "Screenshot of %s" -msgstr "Skärmbild för %s" +msgid "Impossible to get the avatar: %s" +msgstr "Omöjligt att få avataren: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Spara skärmbild" +#: ../vinagre/vinagre-tube-handler.c:538 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s vill dela sitt skrivbord med dig." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable this feature." -msgstr "" -"Skalning stöds inte för denna installation.\n" -"\n" -"Läs filen README (kommer med Vinagre) för information om hur man aktiverar denna funktion." +#: ../vinagre/vinagre-tube-handler.c:543 +msgid "Desktop sharing invitation" +msgstr "Inbjudan om skrivbordsdelning" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Dator" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "R_edigera" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Visa" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Bokmärken" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Anslut till en fjärrdator" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Öppna en .VNC-fil" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Avsluta programmet" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Redigera programmets inställningar" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Öppna bokmärke" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Anslut till denna dator" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "R_edigera bokmärke" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Redigera detaljerna för markerat bokmärke" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Ta bort från bokmärken" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Ta bort aktuellt markerad anslutning från bokmärken" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Ny mapp" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Skapa en ny mapp" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Innehåll" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Öppna handboken för Vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Om det här programmet" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Verktygsrad" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Visa eller dölj verktygsraden" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Statusrad" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Visa eller dölj statusraden" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Sido_panel" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Visa eller dölj sidopanelen" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Stäng aktuell anslutning" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "S_täng alla" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Stäng alla aktiva anslutningar" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Lägg till bokmärke" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Lägg till aktuell anslutning till dina bokmärken" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Ta skärmbild" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Ta en skärmbild på aktiv anslutning" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Skicka Ctrl+Alt+Del till aktiv anslutning" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Visa den aktuella datorn i helskärm" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Ursprunglig storlek" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Justerar fönstret till storleken för fjärrskrivbordet" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "Ska_lning" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Passa in fjärrskärmen i den aktuella fönsterstorleken" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "S_krivskyddad" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Inaktivera mus och tangentbord" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Verktygsrad" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Visa eller dölj verktygsraden" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Statusrad" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Visa eller dölj statusraden" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Sido_panel" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Visa eller dölj sidopanelen" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Ett fel har inträffat:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre är en VNC-klient för GNOME-skrivbordet" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Kunde inte läsa in byggfil: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre är en fjärrskrivbordsklient för GNOME-skrivbordet" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "Vinagre 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 "Vinagre är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "Vinagre 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 "Vinagre distribueras i hopp om att det ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "You should have received a copy of the GNU General Public License along with this program. If not, see ." msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med detta program. Om inte, se ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Daniel Nylander \n" @@ -753,29 +959,53 @@ "Skicka synpunker på översättningen till\n" "tp-sv@listor.tp-sv.se" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Webbplats för Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Kunde inte sammanfoga vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Tidigare anslutningar" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Öppna %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Tryck på Ctrl+Alt för att släppa muspekaren" - +#~ msgid "(Protocol: %s)" +#~ msgstr "(Protokoll: %s)" +#~ msgid "Minimize window" +#~ msgstr "Minimera fönster" +#~ msgid "Supported formats" +#~ msgstr "Format som stöds" +#~ msgid "_Plugins" +#~ msgstr "I_nsticksmoduler" +#~ msgid "Select plugins" +#~ msgstr "Välj insticksmoduler" +#~ msgid "Connection" +#~ msgstr "Anslutning" +#~ msgid "Folder" +#~ msgstr "Mapp" +#~ msgid "host or host:display or host::port" +#~ msgstr "värd eller värd:display eller värd::port" +#~ msgid "Choose a VNC Server" +#~ msgstr "Välj en VNC-server" +#~ msgid "Could not find the host address in the file." +#~ msgstr "Kunde inte hitta värdadressen i filen." +#~ msgid "Opens a .vnc file" +#~ msgstr "Öppnar en .vnc-fil" +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- VNC-klient för GNOME" +#~ msgid "_Read only" +#~ msgstr "S_krivskyddad" +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "Tryck på Ctrl+Alt för att släppa muspekaren" #~ msgid "Editing a bookmark" #~ msgstr "Redigering av bokmärke" #~ msgid "Enter a name for this connection" @@ -804,8 +1034,6 @@ #~ msgstr "" #~ "Skalning fungerar inte korrekt på kompositerade fönster. Inaktivera de " #~ "visuella effekterna och försök igen." -#~ msgid "_Port:" -#~ msgstr "_Port:" #~ msgid "Expected `%s' got `%s' for key %s" #~ msgstr "Förväntade \"%s\", fick \"%s\" för nyckeln %s" #~ msgid "Press Ctrl+Alt to grab the cursor" @@ -828,8 +1056,6 @@ #~ msgstr "Vinagre" #~ msgid "_Favorites" #~ msgstr "_Favoriter" -#~ msgid "Configure the application" -#~ msgstr "Konfigurera programmet" #~ msgid "_Open favorite" #~ msgstr "_Öppna favorit" #~ msgid "Connect to this favorite" @@ -840,8 +1066,6 @@ #~ msgstr "Kopiera markeringen" #~ msgid "Paste the clipboard" #~ msgstr "Klistra in urklippet" -#~ msgid "VNC Client" -#~ msgstr "VNC-klient" #~ msgid " " #~ msgstr " " #~ msgid "gtk-cancel" diff -Nru vinagre-2.26.1/po/ta.po vinagre-2.29.1/po/ta.po --- vinagre-2.26.1/po/ta.po 2009-03-17 00:19:13.000000000 +0000 +++ vinagre-2.29.1/po/ta.po 2009-10-24 13:56:52.000000000 +0100 @@ -1,22 +1,26 @@ -# translation of ta.po to Tamil -# Dr.T.Vasudevan , 2008. -# I. Felix , 2008, 2009. -# Dr.T.vasudevan , 2009. +# translation of vinagre.master.ta.po to Tamil # translation of ta.po to # translation of vinagre.ta.po to +# Dr.T.Vasudevan , 2008, 2009. +# I. Felix , 2008, 2009. +# Dr.T.vasudevan , 2009. msgid "" msgstr "" -"Project-Id-Version: ta\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-09 07:05+0000\n" -"PO-Revision-Date: 2009-03-09 12:41+0530\n" -"Last-Translator: I. Felix \n" -"Language-Team: Tamil \n" +"Project-Id-Version: vinagre.master.ta\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." +"cgi?product=vinagre&component=general\n" +"POT-Creation-Date: 2009-09-29 18:50+0000\n" +"PO-Revision-Date: 2009-10-09 12:28+0530\n" +"Last-Translator: Dr.T.Vasudevan \n" +"Language-Team: Tamil \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\\n\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\\n" +"\n" +"\n" +"\n" "\n" "\n" "\n" @@ -24,11 +28,11 @@ "\n" "\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "பற்றி (_A) " -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "உதவி (_H)" @@ -37,124 +41,121 @@ msgstr "தொலை பணிமேடைகளை அணுகுதல்" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "தொலை பணிமேடை காட்டி" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr " அங்கீகாரம் அவசியம்" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr " இணைப்பு தேர்வுகள்" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "இணைப்பு" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr " அடைவு" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr " இடைமுகம்" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "தேர்வுகள்" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr " தாய் அடைவு" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "எந்த கணினியுடன் நீங்கள் இணைக்க வேண்டும்?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "அனைத்து புலங்களும் அவசியமானவை" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "அனைத்து புலங்களும் அவசியமானவை" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "அங்கீகாரம் தேவைப்படுகிறது" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "புத்தகக்குறிகள்" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "இணைப்பு" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "இணைப்பு விருப்பங்கள்" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "கோப்புறை" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "புரவலன்:" -#: ../data/vinagre.glade.h:12 -msgid "Preferences" +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "இடைமுகம்" + +#: ../data/vinagre.ui.h:9 +msgid "Options" msgstr "விருப்பங்கள்" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "ஒரே ஒரு இணைப்பு மட்டும் செயலில் உள்ளபோதும் கீற்றுகளை காட்டலாமா" +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "பெற்றோர் கோப்புறை>" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "பட்டி விரைவு விசை (குறுக்குவிசை) களை காட்டலாமா " +#: ../data/vinagre.ui.h:11 +msgid "Preferences" +msgstr "விருப்பங்கள்" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "எந்த கணினியுடன் நீங்கள் இணைக்க வேண்டும்?" + +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "(_A) எப்போதும் கீற்றுகளை காட்டு" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 -#| msgid "Authentication failed" +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "அனுமதித்தல் (_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "முழுத் திரை (_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "புரவலன் (_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "பெயர் (_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "கடவுச்சொல் (_P):" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "நெறிமுறை (_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "இந்த அறிமுக ஆவணத்தை நினைவில் கொள்ளவும் (_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "(_S) அளவு மாற்றுதல் " - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "(_S) பட்டி விரைவு விசைகளை காட்டவும்" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "(_U) பயனர் பெயர்:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "பார்வைக்கு மட்டும் (_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "கூடுதல் இணைப்பை செயல்படுத்து" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "புரவலன் அல்லது புரவலன் :காட்சி அல்லது புரவலன்::துறை" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"செயலிலுள்ள கூடுதல் இணைப்புகளின் பட்டியல். இது செயலிலுள்ள கூடுதல் இணைப்பின் \"இடத்தை\" " +"கொண்டுள்ளது. .vinagre-plugin கோப்பினை \"இடத்தை\" கொடுக்கப்பட்ட கூடுதல் இணைப்புக்கு " +"பெறுகிறதா என பார்க்கவும்." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "இணை உரையாடலில் அதிக பட்ச வரலாற்று உருப்படி எண்" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -164,7 +165,7 @@ "செயல் படும். ஆவைற்றை அமைத்தால் பட்டியால் அவ்விசைகள் தடுக்கப்படும். தொலை புரவலனுக்கு " "அனுப்பப்பட மாட்டா என குறிக்க." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -172,15 +173,15 @@ "\"உண்மை\" என அமைத்தால் கீற்றுகள் எப்போதும் காட்டப்படும். \"தவறு\" என அமைத்தால் ஒரு " "இணைப்புக்கு மேல் செயல் படும் போது மட்டுமே கீற்றுகள் காட்டப்படும்." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "கீழிறங்கும் புரவலன் உள்ளீட்டில் அதிக பட்ச உருப்படி எண்" -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" URL களுக்கு கையாளி" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -190,10 +191,18 @@ "துண்டிக்கலாம் என கூறலாம். மற்ற சார்ந்தோன்களுடன் மேல்மேசையை பகிந்துகொள்ள மதிப்பை உண்மை என " "அமை." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr " மற்ற இணைப்புகள் இருக்க விடலாமா" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "ஒரே ஒரு இணைப்பு மட்டும் செயலில் உள்ளபோதும் கீற்றுகளை காட்டலாமா" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "பட்டி விரைவு விசை (குறுக்குவிசை) களை காட்டலாமா " + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "தொலை பணிமேடை (விஎன்சி(VNC)) கோப்பு" @@ -202,89 +211,277 @@ msgid "Remote Desktop Connection" msgstr "தொலை பணிமேடை இணைப்பு" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux முனையங்களை அணுகு" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "துறை:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH துணை" + +#: ../plugins/vnc/vinagre-vnc-connection.c:218 +#: ../plugins/vnc/vinagre-vnc-plugin.c:320 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"பகிர்ந்த குறிக்கு பிழையான மதிப்பு: %d. அது 0 அல்லது 1 ஆக இருக்க வேண்டும். " +"உதாசீனப்படுத்தப்படுகிறது" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +#| msgid "_Recent connections" +msgid "_Reverse Connections..." +msgstr "_R இணைப்புகளை திருப்புக..." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:85 +msgid "Configure incoming VNC connections" +msgstr "உள்வரும் VNC இணைப்புகளை கட்டமைக்கவும்" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:172 +msgid "Enable scaled mode" +msgstr "அளவிடப்பட்ட முறைமையை செயல்படுத்து" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:187 +msgid "VNC Options:" +msgstr "VNC விருப்பங்கள்:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:189 +msgid "Show VNC Options" +msgstr "VNC விருப்பங்களைக் காட்டு" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:211 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:212 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows மற்றும் பிற கணினிகளை அணுகு." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:269 +msgid "Could not parse the file." +msgstr "கோப்பினை அலகிட முடியவில்லை" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:276 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "கோப்பு ஒரு VNC இல்லை: குழு \"இணைப்பை\" தொலைக்கிறது." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:282 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "கோப்பு ஒரு VNC அல்ல: விசை \"புரவலனை\" தொலைக்கிறது." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:349 +msgid "VNC Options" +msgstr "VNC விருப்பங்கள்" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:360 +#: ../plugins/vnc/vinagre-vnc-tab.c:660 +msgid "_View only" +msgstr "பார்வைக்கு மட்டும் (_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:367 +msgid "_Scaling" +msgstr "(_S) அளவு மாற்றுதல் " + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:391 +msgid "VNC Files" +msgstr "VNC கோப்புகள்" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "பணிமேடை பெயர்:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "பரிமாணங்கள்:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:274 +msgid "Error connecting to host." +msgstr "புரவலனுடன் இணைக்கும் போது பிழை" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:312 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "புரவலன் %s க்கு உரிம முறை துணைபுரியவில்லை. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:316 +msgid "Authentication unsupported" +msgstr "உரிம முறை துணைபுரியவில்லை." + +#: ../plugins/vnc/vinagre-vnc-tab.c:576 ../plugins/vnc/vinagre-vnc-tab.c:593 +msgid "Authentication error" +msgstr "அனுமதித்தல் பிழை" + +#: ../plugins/vnc/vinagre-vnc-tab.c:577 +msgid "A username is required in order to access this machine." +msgstr "இந்த கணினியை அணுக ஒரு பயனர் பெயர் தேவைப்படுகிறது." + +#: ../plugins/vnc/vinagre-vnc-tab.c:594 +msgid "A password is required in order to access this machine." +msgstr "இந்த கணினியை அணுக ஒரு கடவுச்சொல் தேவைப்படுகிறது." + +#: ../plugins/vnc/vinagre-vnc-tab.c:645 +msgid "S_caling" +msgstr "(_c) அளவு மாற்றுதல்" + +#: ../plugins/vnc/vinagre-vnc-tab.c:646 +msgid "Fits the remote screen into the current window size" +msgstr "தொலை திரையை தற்போதைய சாளர அளவுக்கு பொருத்துகிறது" + +#: ../plugins/vnc/vinagre-vnc-tab.c:661 +msgid "Does not send mouse and keyboard events" +msgstr "சொடுக்கி மற்றும் விசைப்பலகை நிகழ்ச்சிகளை அனுப்பாதீர்கள்" + +#: ../plugins/vnc/vinagre-vnc-tab.c:674 +msgid "_Original size" +msgstr "(_O) அசல் அளவு" + +#: ../plugins/vnc/vinagre-vnc-tab.c:675 +msgid "Adjusts the window to the remote desktop's size" +msgstr "சாளரத்தை தொலை மேல்மேசை அளவுக்கு மாற்றுக" + +#: ../plugins/vnc/vinagre-vnc-tab.c:698 ../plugins/vnc/vinagre-vnc-tab.c:772 +#: ../plugins/vnc/vinagre-vnc-tab.c:773 +msgid "Send Ctrl-Alt-Del" +msgstr "அனுப்பு Ctrl Alt Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:699 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "தொலை கணினிக்கு Ctrl+Alt+Del அனுப்புகிறது" + +#: ../plugins/vnc/vinagre-vnc-tab.c:751 ../plugins/vnc/vinagre-vnc-tab.c:752 +msgid "Scaling" +msgstr "அளவு மாற்றுதல் " + +#: ../plugins/vnc/vinagre-vnc-tab.c:761 ../plugins/vnc/vinagre-vnc-tab.c:762 +msgid "Read only" +msgstr "படிக்க மட்டும்" + +#: ../plugins/vnc/vinagre-vnc-tab.c:931 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"அளவு மாற்றுதல் இந்த நிறுவலில் இயங்காது.\n" +"\n" +" இதை எப்படி கையாளுவது என அறிய வினாக்ரேவுடன் வந்த 'என்னைப்படி' கோப்பை பார்க்க. " + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC துணை" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "தொலை கணினியுடன் விரைவில் இணைக்க ஒரு பட்டி" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "வினாக்ரே குறுநிரல் தொழிற்சாலை" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "வினாக்ரே ஐ இயக்க முடியவில்லை:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "தொலை பணிமேடை காட்டியை திற" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "உங்கள் புத்தகக்குறிகளை அணுகுக" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "நெறிமுறை %s துணைபுரியவில்லை." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "புத்தகக்குறி ஆரம்பிக்கும் போது பிழை: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:273 msgid "Unknown error" msgstr "தெரியாத பிழை" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "புத்தகக்குறி ஆரம்பிக்கும் போது பிழை: கோப்பு காலியாக உள்ளது போலிருக்கிறது" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "புத்தகக்குறி ஆரம்பிக்கும் போது பிழை: இந்த கோப்பு வினாக்ரே புத்தகக்குறிப்பு கோப்பு அல்ல" +msgstr "" +"புத்தகக்குறி ஆரம்பிக்கும் போது பிழை: இந்த கோப்பு வினாக்ரே புத்தகக்குறிப்பு கோப்பு அல்ல" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "புத்தகக்குறிகளை சேமிக்கும் போது பிழை: எக்ஸ்எம்எல் கட்டமைப்பை உருவாக்க முடியவில்லை" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "புத்தகக்குறிகளை சேமிக்கும் போது பிழை: எக்ஸ்எம்எல் கட்டமைப்பை துவக்க முடியவில்லை" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "புத்தகக்குறிகளை சேமிக்கும் போது பிழை: எக்ஸ்எம்எல் கட்டமைப்பை இறுதியாக்க முடியவில்லை" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "புத்தகக்குறிகளை சேமிக்கும் போது பிழை: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "புத்தகக்குறிகளை நகர்த்தும் போது பிழை: எக்ஸ்எம்எல் கட்டமைப்பை உருவாக்க முடியவில்லை" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "புத்தகக்குறிகளை நகர்த்தும் போது பிழை: எக்ஸ்எம்எல் கட்டமைப்பை துவக்க முடியவில்லை" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "புத்தகக்குறிகளை நகர்த்தும் போது பிழை: எக்ஸ்எம்எல் கட்டமைப்பை இறுதியாக்க முடியவில்லை" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "புத்தகக்குறிகளை நகர்த்தும் போது பிழை: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "புத்தகக்குறிகளை நகர்த்தும் போது பிழை:VNC கூடுதல் இணைப்பபு செயல்படுத்தப்படவில்லை" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "அடைவை உருவாக்குதல் தோல்வியுற்றது" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -292,443 +489,495 @@ " புத்தகக்குறி கோப்பு புதிய இடத்துக்கு நகர்த்துகிறது. இந்த செயல் ஒரு முறை மட்டுமே இயங்க " "வேண்டும்.." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "பழைய புத்தகக்குறிகளை திறக்கும் போது பிழை: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "நகர்த்துதல் இரத்து செய்யப்பட்டது " -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "பழைய புத்தகக்குறிகள் கோப்பை நீக்க முடியவில்லை" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "மூல அடைவு" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "இந்த அடைவுக்கு செல்லுபடியாகாத பெயர்" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "நீங்கள் புத்தகக்குறியிலிருந்து %sஐ நிச்சயம் நீக்க வேண்டுமா?" +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "" +"இந்த அடைவில் \"%s\" என்ற பெயர் ஏற்கெனவே பயனில் உள்ளது. தயை செய்து வேறு பெயரை " +"யன்படுத்துக." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "இந்த உருப்படிக்கு செல்லுபடியாகாத பெயர்" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(நெறிமுறை: %s)" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "நீங்கள் புத்தகக்குறியிலிருந்து %sஐ நிச்சயம் நீக்க வேண்டுமா?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "அடைவை நீக்கவா?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "துணை அடைவுகளும் மற்ற எல்லா உருப்படிகளும் நீக்கப்படும் என அறியவும்" -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "உருப்படியை நீக்கவா?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "புத்தகக்குறிகளை சேமிக்கும் போது பிழை: உள்ளீட்டை காணவில்லை" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "புதிய அடைவு" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "கோப்பினை தேர்வு செய்யவும்" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "துணைபுரியும் வடிவங்கள்" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "துணைபுரியும் கோப்புகள் இல்லை" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"துணைபுரியும் கோப்பினை திறக்க செயலிலுள்ள கூடுதல் இணைப்புகளை திறக்க இல்லை. சில கூடுதல் " +"இணைப்புகள் செயல்படுத்தி மீண்டும் முயற்சிக்கவும்." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "பின்வரும் கோப்பினை திறக்க முடியாது" msgstr[1] "பின்வரும் கோப்புகளை திறக்க முடியாது" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "நெறிமுறை பட்டியலில் செயலிலுள்ள நெறிமுறையை பெற முடியாது." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "வரலாறு கோப்பை சேமிக்கும் போது பிழை: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "ஒரு விஎன்சி(VNC) சேவையகத்தை தேர்வு செய்யவும்" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "ஒரு தொலை பணிமேடை தேர்ந்தெடு" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "நெறிமுறை %s துணைபுரியவில்லை." - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "கோப்பினை திறக்க முடியவில்லை" -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "கோப்பினை அலகிட முடியவில்லை" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "கோப்பு எந்த கூடுதல் இணைப்புகளுடனும் அறியப்படவில்லை." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"பகிர்ந்த குறிக்கு பிழையான மதிப்பு: %d. அது 0 அல்லது 1 ஆக இருக்க வேண்டும். " -"உதாசீனப்படுத்தப்படுகிறது" - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "கோப்பில் புரவலன் முகவரியை கண்டு பிடிக்க முடியவில்லை." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "செல்லுபடியாகாத செயல்" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "இழுத்துவிடும் செயலில் இருந்து பெறப்பட்ட தரவு செல்லுபடியாகாது" -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "அருகிலுள்ள புரவலன்கள்" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "ஒரு .விஎன்சி கோப்பினை திறக்கிறது" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "vinagreஐ முழுத்திரை முறைமையில் திற" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "கோப்பு பெயர்" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "இயக்கத்தில் உள்ள ஒரு வினாக்ரே வில் புதிய உயர் மட்ட சாளரம் உருவாக்கு" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "vinagreஆல் அறியப்பட்ட ஒரு கோப்பினை திற" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "கோப்பு பெயர்" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "பின்வரும் பிழை ஏற்பட்டுள்ளது:" msgstr[1] "பின்வரும் பிழைகள் ஏற்பட்டுள்ளன:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- க்னோம்க்கு விஎன்சி(VNC) சார்ந்தோன் " +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- தொலை பணிமேடை காட்டி" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" -msgstr "'vinagre --help' என இயக்கினால் இருக்கும் கட்டளைவரி விருப்பங்களின் பட்டியலை கொடுக்கவும்" +msgstr "" +"'vinagre --help' என இயக்கினால் இருக்கும் கட்டளைவரி விருப்பங்களின் பட்டியலை கொடுக்கவும்" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "ஆவாஹி புரவலன் பெயரை கண்டறிதல் தோற்றது: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "கூடுதல் இணைப்பு %s சேவை %sக்கு ஏற்கனவே ஒரு உலாவியில் பதிவு செய்யப்பட்டது." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "%sக்கு mDNS உலாவிக்கான சேவையை சேர்க்க முடியவில்லை." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "புரவலன்களுக்கு உலாவல் தோற்றது : %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS உலாவியை துவக்க முடியவில்லை : %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "புரவலன் %s உடன் உள்ள இணைப்பு துண்டிக்கப்பட்டது." +msgid "Connection to host %s was closed." +msgstr "புரவலன் %s உடன் உள்ள இணைப்பு துண்டிக்கப்பட்டது." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "இணைப்பு துண்டிக்கப்பட்டது." -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "புரவலன் %s க்கு உரிமப்படுத்த முடியவில்லை" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "அனுமதித்தல் தோல்வி" + +#: ../vinagre/vinagre-notebook.c:526 msgid "Connecting..." msgstr "இணைக்கிறது..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:553 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "இணைப்பை துண்டிக்கவும்" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "கூடுதல் இணைப்பு மேலாளர்" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "கூடுதல் இணைப்பு" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "செயல்படுத்து" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "கட்டமைப்பு (_o)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "செயல்படுத்து (_c)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "அனைத்தையும் செயல்படுத்து (_t)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "அனைத்தையும் செயல்நீக்கு (_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "கூடுதல் இணைப்பு பற்றி (_A) " + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "கட்டமைப்பு கூடுதல் இணைப்பு (_o)" + +#: ../vinagre/vinagre-prefs.c:229 msgid "Cannot initialize preferences manager." msgstr "முன்னுரிமைகள் மேலாளரை துவக்க முடியவில்லை." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "புரவலனுடன் இணைக்கும் போது பிழை" - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "புரவலன் %s க்கு உரிமப்படுத்த முடியவில்லை" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "அனுமதித்தல் தோல்வி" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "புரவலன் %s க்கு உரிம முறை துணைபுரியவில்லை. (%u)" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "முழுத்திரையை விடு" -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "உரிம முறை துணைபுரியவில்லை." - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "சமீபத்திய இணைப்பை சேமிக்கும் போது பிழை" -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "விசை வளையத்தில் அறிமுக ஆவணம் சேமிக்கும் போது பிழை." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -#| msgid "Authentication failed" -msgid "Authentication error" -msgstr "அனுமதித்தல் பிழை" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "இந்த கணினியை அணுக ஒரு பயனர் பெயர் தேவைப்படுகிறது." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "இந்த கணினியை அணுக ஒரு கடவுச்சொல் தேவைப்படுகிறது." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "சாளரத்தை சிறிதாக்கு" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "அளவு மாற்றுதல் " +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "இணைப்பின் திரைவெட்டை பிடிக்க முடியவில்லை" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "படிக்க மட்டும்" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "திரைப்பிடிப்பை சேமிக்கவும்" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "திரைபிடிப்பு எடுக்கவும்" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s இன் திரைப்பிடிப்பு" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "அனுப்பு Ctrl Alt Del" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "திரைசேமிப்பை சேமிக்கும் போது பிழை" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "பணிமேடை பெயர்:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "சேவை தன்மை பெற முடியாது: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "துறை:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "இணைப்பை உருவாக்க முடியவில்லை: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "பரிமாணங்கள்:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "ஸ்டிரிம் ட்யூப்பை அணுக முடியாது: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "இணைப்பின் திரைவெட்டை பிடிக்க முடியவில்லை" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "தொடர்பு பெயரை பெற முடியாது: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s இன் திரைப்பிடிப்பு" +msgid "Impossible to get the avatar: %s" +msgstr "அவதாரை பெற முடியாது: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "திரைப்பிடிப்பை சேமிக்கவும்" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s அவனுடைய பணிமேடையை உங்களுடன் பகிர விரும்புகிறான்." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"அளவு மாற்றுதல் இந்த நிறுவலில் இயங்காது.\n" -"\n" -" இதை எப்படி கையாளுவது என அறிய வினாக்ரேவுடன் வந்த 'என்னைப்படி' கோப்பை பார்க்க. " +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "பணிமேடை பகிரும் அழைப்பிதழ்" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "கணினி (_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "தொகுத்தல் (_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "பார்வை (_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "புத்தகக்குறிகள் (_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "ஒரு தொலை கணினியுடன் இணை" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "ஒரு .விஎன்சி(VNC) கோப்பினை திறத்தல்" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "நிரலை விட்டு வெளியேறுதல்" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "பயன்பாட்டின் விருப்பங்களை திருத்துக" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "புத்தகக்குறியைத் திறத்தல் (_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "இந்த கணினியுடன் இணை" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "புத்தகக்குறியை திருத்துதல் (_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "தேர்ந்தெடுக்கப்பட்ட புத்தகக்குறியின் விவரங்களை திருத்தவும்" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "புத்தகக்குறிகளிலிருந்து நீக்கவும் (_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "தற்போது தேர்ந்தெடுக்கப்பட்ட இணைப்பை புத்தகக்குறிகளிலிருந்து நீக்கவும்" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_N புதிய அடைவு" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "புதிய அடைவை உருவாக்கவும்" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "உள்ளடக்கம் (_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "வினாக்ரே கையேட்டை திறக்கவும்" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "இந்தப் பயன்பாடு பற்றி" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "கருவிப்பட்டை (_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "கருவிப்பட்டையைக் காட்டவும் அல்லது மறைக்கவும்" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "நிலைப்பட்டி (_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "நிலைப்பட்டையைக் காட்டவும் அல்லது மறைக்கவும்" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "(_P) பக்க பலகம்" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "பக்க பலகத்தை காட்டவும் அல்லது மறைக்கவும்" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "நடப்பு இணைப்பை துண்டிக்கவும்" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "அனைத்தையும் மூடவும் (_l)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "அனைத்து செயலிலுள்ள இணைப்பை துண்டித்தல்" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "புத்தகக்குறிகளில் சேர்த்தல் (_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "நடப்பு இணைப்புகளை உங்கள் புத்தகக்குறிகளில் சேர்த்தல்" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "திரைபிடிப்பு எடுக்கவும்" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "செயலிலுள்ள இணைப்பை திரைப்பிடிப்பு செய்யவும்" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "செயலிலுள்ள இணைப்புக்கு Ctrl+Alt+Del அனுப்புக" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "நடப்பு கணினியை முழுத்திரையில் பார்க்கவும்" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "(_O) அசல் அளவு" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "சாளரத்தை தொலை மேல்மேசை அளவுக்கு மாற்றுக" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "(_c) அளவு மாற்றுதல்" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "தொலை திரையை த்ற்போதைய சாளர அளவுக்கு பொருத்து " - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "வாசிப்பு மட்டும் (_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "சொடுக்கி மற்றும் விசைப்பலகையை முடமாக்குக" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "கருவிப்பட்டை (_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "கருவிப்பட்டையைக் காட்டவும் அல்லது மறைக்கவும்" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "நிலைப்பட்டி (_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "நிலைப்பட்டையைக் காட்டவும் அல்லது மறைக்கவும்" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "(_P) பக்க பலகம்" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "பக்க பலகத்தை காட்டவும் அல்லது மறைக்கவும்" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "பிழை ஒன்று ஏற்பட்டுள்ளது:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "வினாக்ரே என்பது க்னோம் பணிமேடைக்கு விஎன்சி(VNC) சார்ந்தோன் ஆகும்" +#: ../vinagre/vinagre-utils.c:175 +msgid "" +"A plugin tried to open an UI file but did not succeed, with the error " +"message:" +msgstr "ஒரு சொருகி ஒரு யூஐ கோப்பை திறக்க முயன்றது; ஆனால் வெற்றி அடையவில்லை. வழு செய்தி:" + +#: ../vinagre/vinagre-utils.c:177 +msgid "" +"The program tried to open an UI file but did not succeed, with the error " +"message:" +msgstr "ஒரு நிரலட ஒரு யூஐ கோப்பை திறக்க முயன்றது. ஆனால் வெற்றி அடையவில்லை. வழு செய்தி:" + +#: ../vinagre/vinagre-utils.c:180 +msgid "Please check your installation." +msgstr "உங்கள் நிறுவலை சரிபார்க்கவும்." + +#: ../vinagre/vinagre-utils.c:181 +#| msgid "Error while saving history file: %s" +msgid "Error loading UI file" +msgstr "யூஐ கோப்பை சேமிக்கும் போது பிழை" + +#: ../vinagre/vinagre-utils.c:486 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre என்பது க்னோம் பணிமேடைக்கு தொலை பணிமேடை காட்டியாகும்" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:489 msgid "" "Vinagre 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 " @@ -739,7 +988,7 @@ "பொது அனுமதிக்கான இந்த 2ம் பதிப்பு அல்லது அடுத்த பதிப்புகள் விதிகளின் படி நீங்கள் " "(விருப்பப்படி) மாற்றலாம். அல்லது மீண்டும் பறிமாறலாம்" -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:493 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -750,7 +999,7 @@ "குறிப்பிட்ட செயலுக்கான தகுதி உள்பட எந்த உத்திரவாதமும் அளிக்கப்படவில்லை. மேற் கொண்டு " "விவரங்களுக்கு ஜிஎன்யு பொது அனுமதிக்கான விதிகளை பார்க்கவும்" -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:497 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -758,30 +1007,38 @@ "இந்த நிரலுடன் குனு பொது பொதுவுடைமை உரிமத்தின் பிரதி ஒன்று தங்களுக்குக் கிடைத்திருக்க " "வேண்டும்.இல்லை என்றால் பார்க்வும்." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:519 msgid "translator-credits" -msgstr "Dr. T. Vasudevan , I. Felix 2008" +msgstr "" +"Dr. T. Vasudevan 2009, I. Felix " +"2008" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:522 msgid "Vinagre Website" msgstr "வினாக்ரே இணையதளம்" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:404 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml ஐ இணைக்க முடியவில்லை: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:432 msgid "_Recent connections" msgstr "சமீபத்திய இணைப்புகள் (_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:592 #, c-format msgid "Open %s:%d" msgstr "%s ஐ திற:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "கண்ட்ரோல் ஆல்ட் விசைகளை அழுத்தி நிலைகாட்டியை விடுவிக்கவும்" - +#~| msgid "Failed to resolve avahi hostname: %s\n" +#~ msgid "Failed to request name: %s" +#~ msgstr "பெயரை விண்ணப்பிக்க முடியவில்லை: %s" + +#~ msgid "No error given" +#~ msgstr "பிழை தரப்படவில்லை" + +#~| msgid "Could not open the file." +#~ msgid "Could not load builder file: %s" +#~ msgstr "பில்டர் கோப்பை ஏற்ற முடியவில்லை: %s" diff -Nru vinagre-2.26.1/po/te.po vinagre-2.29.1/po/te.po --- vinagre-2.26.1/po/te.po 2009-03-17 00:19:13.000000000 +0000 +++ vinagre-2.29.1/po/te.po 2009-09-17 15:20:20.000000000 +0100 @@ -1,726 +1,960 @@ -# translation of vinagre.HEAD.po to Telugu +# translation of vinagre.master.te.po to Telugu # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Krishna Babu K , 2009. msgid "" msgstr "" -"Project-Id-Version: vinagre.HEAD\n" +"Project-Id-Version: vinagre.master.te\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n" -"POT-Creation-Date: 2009-03-10 09:28+0000\n" -"PO-Revision-Date: 2009-03-11 13:30+0530\n" +"POT-Creation-Date: 2009-09-01 06:12+0000\n" +"PO-Revision-Date: 2009-09-11 20:37+0530\n" "Last-Translator: Krishna Babu K \n" "Language-Team: Telugu \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\n" +"\n" +"\n" "X-Generator: KBabel 1.11.4\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "గురించి(_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "సహాయం(_H)" #: ../data/vinagre.desktop.in.in.h:1 ../data/vinagre-file.desktop.in.in.h:1 msgid "Access remote desktops" -msgstr "" +msgstr "దూరస్థ రంగస్థలములను యాక్సిస్ చేయుము" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" -msgstr "" +msgstr "దూరస్థ రంగస్థల దర్శని" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "పైని అన్ని క్షేత్రములు తప్పనిసరి" -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "బంధము" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "" +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "ధృవీకరణము అవసరమైంది" -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "ఇచ్ఛాపూర్వకాలు:" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "" - -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "పుస్తకచిహ్నాలు" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "అనుసంధానము" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "అనుసంధానము ఐచ్చికములు" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "ఫోల్డర్" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "హొస్ట్:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "ఇంటర్ఫేస్" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "ఐచ్చికములు" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "మాత్రుక ఫోల్డర్" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "అభీష్టాలు" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "Whether we should show tabs even when there is only one active connection" -msgstr "" - -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "మీరు ఏ మిషన్‌కు అనుసంధానము కావాలని కోరుకొనుచున్నారు?" -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" -msgstr "" +msgstr "ఎల్లప్పుడ టాబ్లను చూపుము (_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "దృవీకరించు(_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" -msgstr "" +msgstr "పూర్తి తెర (_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" -msgstr "" +msgstr "హోస్ట్ (_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "నామము(_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "సంకేతపదం(_P):" -#: ../data/vinagre.glade.h:22 -msgid "_Remember this credential" -msgstr "" +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "నిభందన (_P):" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "" +#: ../data/vinagre.ui.h:21 +msgid "_Remember this credential" +msgstr "ఈ ఆనవాళ్ళను గుర్తుంచుకొనుము (_R)" -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" -msgstr "" +msgstr "మెనూ లఘువులను చూపుము (_S)" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" -msgstr "_వినియోగదారు నామము:" +msgstr "వినియోగదారు నామము (_U):" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "క్రియాశీల ప్లగిన్లు" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." msgstr "" +"క్రియాశీల ప్లగిన్ల జాబితా. ఇది క్రియాశీల ప్లగిన్ల \"స్థానమును\" కలిగివుంటుంది. " +"ఇచ్చిన ప్లగిన్ యొక్క \"స్థానమును\" పొందుటకు vinagre-plugin ఫైలు." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" -msgstr "" +msgstr "అనుసంధానము డైలాగునందు చరిత్ర అంశములయొక్క గరిష్ట సంఖ్య" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " "and will not be sent to the remote host." msgstr "" +"మెనూ లఘవులను అచేతనము చేయుటకు \"false\"కు అమర్చుము. చేతనము చేయుటకు \"true\"కు " +"అమర్చుము. అవి చేతనము చేయబడితే, ఆ కీలు మెనూ చేత ఖండించబడతాయి మరియు దూరస్థ హోస్టునకు పంపబడవని " +"గమనించండి." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." msgstr "" +"టాబ్లను యెల్లప్పుడు చూపుటకు \"true\"కు అమర్చండి. ఒకటి కన్నా యెక్కువ క్రియాశీల విండోలు " +"వున్నప్పుడు మాత్రమే టాబ్లను చూపుటకు \"false\"కు అమర్చండి." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." -msgstr "" +msgstr "హోస్టు డ్రాప్‌డౌన్ ప్రవేశమునందు అంశముల గరిష్ట సంఖ్యను తెలుపుతుంది." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" -msgstr "" +msgstr "\"vnc://\" URLs కొరకు సంభాలికలు" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " "to share the desktop with the other clients." msgstr "" +"హోస్టుకు అనుసంధానమగుచున్నప్పుడు, కక్షిదారి సేవికకు యితర అనుసంధానమైవున్న కక్షిదారులను వదిలివేయమని " +"లేదా వున్న అనుసంధానములను వదిలివేయమని చెప్పగలదు. రంగస్థలమును యితర కక్షిదారులతో పంచుకొనుటకు " +"విలువను సత్యమునకు అమర్చుము." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" -msgstr "" +msgstr "అనుసంధానమైవున్న యితర కక్షిదారులను మనము విడువవలెనా" + +#: ../data/vinagre.schemas.in.in.h:10 +msgid "Whether we should show tabs even when there is only one active connection" +msgstr "ఒక క్రియాశీల అనుసంధానము వున్నాకూడా మనము టాబ్లను చూపాలా" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "మెనూ యాగ్జెలరేటర్లను చూపాలా (లఘువులు)" #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" -msgstr "" +msgstr "దూరస్థ రంగస్థలము (VNC) ఫైలు" #: ../data/vinagre-mime.xml.in.h:2 msgid "Remote Desktop Connection" +msgstr "దూరస్థ రంగస్థలము అనుసంధానము" + +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux టెర్మినల్సును యాక్సిస్ చేయుము" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "పోర్టు:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH మద్దతు" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "'shared' ఫ్లాగ్ కొరకు చెడ్డ విలువ: %d. ఇది 0 లేక 1 కావాలి. దీనిని వదిలివేయండి." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "స్కేలు రీతిని చేతనముచేయి" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC ఐచ్చికాలు:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC ఐచ్చికాలు చూపుము" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows మరియు యితర మిషన్లను యాక్సిస్ చేయుము." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "ఫైలును పార్శ్ చేయలేక పోయింది" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "ఫైలు VNCది కాదు: సమూహ \"అనుసంధానము\" తప్పిపోయింది." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "ఫైలు VNCది కాదు: కీ \"హోస్టు\" తప్పిపోయింది." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC ఐచ్చికాలు" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "దర్శనము మాత్రమే (_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "స్కేలింగ్(_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC ఫైళ్ళు" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "రంగస్థలము నామము:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "కొలతలు:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "హోస్టుకు అనుసంధానమగుటలో దోషము" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "%s హోస్టు చేయుటకు ధృవీకరణ పద్దతి మద్దతించనిది. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "దృవీకరణము మద్దతీయనిది" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "దృవీకరణ దోషము" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "ఈ మిషన్ యాక్సిస్ చేయుటకు వినియోగదారినామము అవసరము" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "ఈ మిషన్‌ను యాక్సిస్ చేయుటకు వొక సంకేతపదము అవసరము" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "స్కేలింగ్ (_c)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "దూరస్థ స్క్రీన్‌ను ప్రస్తుత విండో పరిమాణమునకు అమర్చుము" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "మౌస్ మరియు కీబోర్డు ఘటనలను పంపలేదు" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "వాస్తవ పరిమాణము (_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "విండోను దూరస్థ రంగస్థలముయొక్క పరిమాణముకు సర్దుబాటు చేయుము" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del పంపుము" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "దూరస్థ మిషన్‌కు Ctrl+Alt+Del పంపుతోంది" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "కొలబద్దచేయుట" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "చదువుట మాత్రమే" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." msgstr "" +"ఈ సంస్థాపనపై స్కేలింగ్ మద్దతీయబడదు.\n" +"\n" +"ఈ సౌలభ్యాన్ని యెలా చేతనము చేయవలెనో తెలుసుకొనుటకు (వినాగ్రే ఫైలుతో వచ్చిన) README ఫైలును చదువుము." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC మద్దతు" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" -msgstr "" +msgstr "దూరస్థ మిషన్లను త్వరితంగా యాక్సిస్ చేయుటకు మెను" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" -msgstr "" +msgstr "వినాగ్రే ఆప్లేట్ ఫాక్టరి" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" -msgstr "" +msgstr "వినాగ్రేను నడుపలేక పోయింది:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" -msgstr "" +msgstr "దూరస్థ రంగస్థల దర్శనిని తెరువుము" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" -msgstr "" +msgstr "మీ పుస్తకచిహ్నాలును యాక్సిస్ చేయుము" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "ప్రోటోకాల్ %s మద్దతించబడదు" + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" -msgstr "" +msgstr "పుస్తకచిహ్నాలును సిద్దము చేయుచున్నప్పుడు దోషము: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "తెలియని దోషము" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" -msgstr "" +msgstr "పుస్తకచిహ్నాలును సిద్దము చేయుచున్నప్పుడు దోషము: ఫైలు ఖాళీగా వున్నట్లువుంది" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file" -msgstr "" +msgstr "పుస్తకచిహ్నాలును సిద్దపరుస్తున్నప్పుడు దోషము: ఫైలు వినాగ్రే పుస్తకచిహ్నాల ఫైలు కాదు" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" -msgstr "" +msgstr "పుస్తకచిహ్నాలను దాయుచున్నప్పుడు దోషము: XML నిర్మాణమును సృష్టించుటకు విఫలమైంది" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" -msgstr "" +msgstr "పుస్తకచిహ్నాలను దాయుచున్నప్పుడు విఫలమైంది: XML నిర్మాణము సిద్దపరచుటలో విఫలమైంది" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" -msgstr "" +msgstr "పుస్తకచిహ్నాలను దాయుచున్నప్పుడు విఫలమైంది: XML నిర్మాణము ఖరారు చేయుటలో విఫలమైంది" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" -msgstr "" +msgstr "పుస్తకచిహ్నాలను దాయుచున్నప్పుడు దోషము: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" -msgstr "" +msgstr "పుస్తకచిహ్నాలను వలసపంపుటలో దోషము: XML నిర్మాణమును సృష్టించుటకు విఫలమైంది" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" -msgstr "" +msgstr "పుస్తకచిహ్నాలను వలసపంపుటలో దోషము: XML నిర్మాణమును సిద్దముచేయుటలో విఫలమైంది" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" -msgstr "" +msgstr "పుస్తకచిహ్నాలను వలసపంపుటలో దోషము: XML నిర్మాణమును ఖరారు చేయుటలో విఫలమైంది" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" -msgstr "" +msgstr "పుస్తకచిహ్నాలను వలసపంపుటలో దోషము: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "బుక్‌మార్కులను మైగ్రేట చేస్తున్నప్పుడు దోషము: VNC ప్లగిన్ క్రియాశీల పరచబడలేదు" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "డైరెక్టరీను సృష్టించుటకు విఫలమైంది." -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." -msgstr "" +msgstr "పుస్తకచిహ్నాల ఫైలు కొత్త రూపానికి వలసపంపుతున్నది. ఈ ఆపరేషన్ వొకసారి మాత్రమే నడుపవలెను." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" -msgstr "" +msgstr "పాత పుస్తకచిహ్నాల ఫైలు తెరువుటలో దోషము: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" -msgstr "" +msgstr "వలసపంపుట విఫలమైంది" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" -msgstr "" +msgstr "పాత పుస్తకచిహ్నాల ఫైలును తొలగించలేక పోయింది" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "రూట్ ఫొల్డర్" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" -msgstr "" +msgstr "ఈ ఫోల్డర్ కొరకు చెల్లని నామము" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "" +msgid "The name \"%s\" is already used in this folder. Please use a different name." +msgstr "నామము \"%s\" యిప్పటికే ఈ ఫోల్డరునందు వుపయోగించబడింది. దయచేసి వేరొక నామాన్ని వుపయోగించండి." + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "ఈ అంశము కొరకు సరికాని నామము" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(నిభందన: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "మీరు %sను పుస్తకగుర్తులనుండి తీసివేద్దామని ఖచ్చితంగా అనుకొనుచున్నారా?" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" -msgstr "" +msgstr "ఫోల్డరును తీసివేయాలా?" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." -msgstr "" +msgstr "వీటి అన్ని ఉపసంచయములు మరియు వాటి అంశములు తీసివేయబడతాయని గుర్తించండి." -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" -msgstr "" +msgstr "అంశమును తీసివేయాలా?" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" -msgstr "" +msgstr "పుస్తకచిహ్నామును తొలగించుటలో దోషము: ప్రవేశము కనబడలేదు" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "కొత్త సంచి" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" -msgstr "" +msgstr "ఫైలును యెంచుకొనుము" + +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "అక్కడ మద్దతిచ్చు దస్త్రములు లేవు" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." msgstr "" +"ఏ క్రియాశీల ప్లగిన్లు తెరుచుటకు మద్దతిచ్చు ఫైళ్ళను యిచ్చుటలేదు. కొన్ని ప్లగిన్లను క్రియాశీలపర్చుము " +"మరలా ప్రయత్నించుము." -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ఈ క్రింది ఫైలు తెరువబడలేక పోయింది:" +msgstr[1] "ఈ క్రింది ఫైళ్ళు తెరువబడలేక పోయినవి:" + +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "నిభందన జాబితానందు క్రియాశీల నిభందనను పొందలేక పోయింది." -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" -msgstr "" +msgstr "చరిత్ర ఫైలును దాయుటలో దోషము: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "దూరస్థ డెస్కుటాప్‌ను యెంచుకొనుము" -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "" - -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." -msgstr "" - -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "" - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" +msgstr "ఫైలును తెరువలేక పోయింది" -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "ఆ ఫైలు ఏ ప్లగిన్ల చేత గుర్తించబడలేదు." -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" -msgstr "" +msgstr "చెల్లని ఆపరేషన్" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." -msgstr "" +msgstr "లాగి&వదులు ఆపరేషన్ నుండి స్వీకరించబడిన డాటా చెల్లనిది." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" -msgstr "" +msgstr "దగ్గరలోని హోస్టులు" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "vinagreను నిండుతెర రీతినందు తెరువుము" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 +msgid "Create a new toplevel window in an existing instance of vinagre" +msgstr "ప్రస్తుతం వున్న వినాగ్రే నందు పైస్థాయి విండోను సృష్టించుము" -#: ../src/vinagre-main.c:53 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "vinagre ద్వారా గుర్తించబడిన ఫైలును తెరువుము" + +#: ../vinagre/vinagre-main.c:70 msgid "filename" msgstr "దస్త్రనామము" -#: ../src/vinagre-main.c:56 -msgid "Create a new toplevel window in an existing instance of vinagre" -msgstr "" - -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" -msgstr "" +msgstr "[server:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ఈ క్రింది దోషము యెదురైంది:" +msgstr[1] "ఈ క్రింది దోషములు యెదురైనవి:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- దూరస్థ డెస్కుటాప్ దర్శని" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "Run 'vinagre --help' to see a full list of available command line options" -msgstr "" +msgstr "అందుబాటులోవున్న ఆదేశ వరుస ఐచ్చికముల కొరకు 'vinagre --help' నడుపుము" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" -msgstr "" +msgstr "అవాహి హోస్టునామమును పరిష్కరించుటలో విఫలమైంది: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "ప్లగిన్ %s యిప్పటికే వొక బ్రౌజర్‌ను సేవ %s కొరకు నమోదుచేసి వున్నది." + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "సేవ %s కొరకు mDNS బ్రౌజర్‌ను జతచేయుటకు విఫలమైంది." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" -msgstr "" +msgstr "హోస్టుల కొరకు అన్వేషించుటలో విఫలమైంది: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -msgid "Connection to host %s was closed." -msgstr "" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS బ్రౌజర్ సిద్దపరచుటలో విఫలమైంది: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "హోస్టు %sనకు అనుసంధానము మూయబడింది." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" -msgstr "" +msgstr "అనుసంధానము మూయబడింది" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "హోస్టు %sనకు ధృవీకరణ విఫలమైంది" -#: ../src/vinagre-notebook.c:194 +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "ప్రామాణీకరణ విఫలమైంది" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "అనుసంధానించబడుచున్నది..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" -msgstr "" +msgstr "అనుసంధానము మూయుము" -#: ../src/vinagre-prefs.c:169 -msgid "Cannot initialize preferences manager." -msgstr "అభీష్టముల అభికర్తను సంసిద్ధపరుచుట సాధ్యంకాలేదు" +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "ప్లగిన్ నిర్వాహిక" -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "" +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "ప్లగిన్" -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "" +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "చేతనపరచిన" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "ప్రామాణీకరణ విఫలమైంది" +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "ఆకృతీకరించిన (_o)" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "" +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "క్రియాశీలపరచుము (_c)" -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "" +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "అన్నిటిని క్రియాశీలపరచుము (_t)" -#: ../src/vinagre-tab.c:460 -msgid "Error saving recent connection." -msgstr "" +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "అన్నిటిని క్రియాహీనపరచుము (_D)" -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "" +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "ప్లగిన్ గురించి (_A)" -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "" +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "ప్లగిన్ ఆకృతీకరించుము (_o)" -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "" +#: ../vinagre/vinagre-prefs.c:217 +msgid "Cannot initialize preferences manager." +msgstr "అభీష్టముల అభికర్తను సంసిద్ధపరుచుట సాధ్యంకాలేదు" -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "నిండుతెరను వదిలివేయుము" -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "" +#: ../vinagre/vinagre-tab.c:495 +msgid "Error saving recent connection." +msgstr "ఇటీవలి అనుసంధానమును దాయుటలో దోషము." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "కొలబద్దచేయుట" +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "కీరింగునందలి ఆనవాళ్ళను దాయుటలో దోషము." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "చదువుట మాత్రమే" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "అనుసంధానము యొక్క తెరపట్టును పొందలేక పోయింది." -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "తెర ఛాయచిత్రం దాచుము" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s యొక్క తెరపట్టు" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "స్క్రీన్‌షాట్ దాయుటలో దోషము" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "పోర్టు:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "సేవా లక్షణమును పొందుట అసాధ్యము: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "కొలతలు:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "అనుసంధానమును సృష్టించుట అసాధ్యము: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "స్ట్రీమ్ ట్యూబ్‌ను ఆమోదించుట అసాధ్యము: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:463 #, c-format -msgid "Screenshot of %s" -msgstr "" +msgid "Impossible to get the contact name: %s" +msgstr "సంప్రదింపు నామమును పొందుట అసాధ్యము: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "తెర ఛాయచిత్రం దాచుము" +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "అవతార్‌ను పొందుట అసాధ్యము: %s" -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s తన డెస్కుటాప్‌ను మీతో పంచుకొనవలెనని అనుకొనుచున్నారు." + +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "డెస్కుటాప్ భాగస్వామ్య ఆహ్వానము" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" -msgstr "" +msgstr "మిషన్ (_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" -msgstr "_సరిచేయు" +msgstr "సరిచేయు (_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "దర్శనం (_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" -msgstr "గుర్తింపులు (_B)" +msgstr "పుస్తకచిహ్నాలు (_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" -msgstr "" +msgstr "దూరస్థ మిషన్‌కు అనుంధామవ్వు" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" -msgstr "" +msgstr ".VNC ఫైలు తెరువుము" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "ఈ కార్యక్రమమును త్యజించు" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" -msgstr "" +msgstr "అనువర్తనపు అభీష్టాలను సరికూర్చుము" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" -msgstr "" +msgstr "పుస్తకచిహ్నాన్ని తెరువుము (_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" -msgstr "" +msgstr "ఈ మిషన్‌కు అనుసంధానమగుము" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" -msgstr "" +msgstr "పుస్తకచిహ్నాన్ని సరికూర్చుము (_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" -msgstr "" +msgstr "ఎంచుకొనిన పుస్తకగుర్తుయొక్క వివరములను సరికూర్చుము" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" -msgstr "" +msgstr "పుస్తకచిహ్నాలనుండి తీసివేయుము (_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" -msgstr "" +msgstr "పుస్తకచిహ్నాల నుండి ప్రస్తుత యెంపికచేసిన అనుసంధానమును తీసివేయుము" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "కొత్త సంచయం(_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" -msgstr "" +msgstr "కొత్త ఫోల్డరును సృష్టించుము" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "సారములు (_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" -msgstr "" +msgstr "వినాగ్రే మాన్యువల్‌ను తెరువుము" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "ఈ కార్యక్షేత్రం గురించి" -#: ../src/vinagre-ui.h:72 -msgid "Close the current connection" -msgstr "" - -#: ../src/vinagre-ui.h:73 -msgid "C_lose All" -msgstr "" - -#: ../src/vinagre-ui.h:74 -msgid "Close all active connections" -msgstr "" - -#. Bookmarks menu -#: ../src/vinagre-ui.h:77 -msgid "_Add to bookmarks" -msgstr "" - -#: ../src/vinagre-ui.h:78 -msgid "Add current connection to your bookmarks" -msgstr "" - -#: ../src/vinagre-ui.h:86 -msgid "Take a screenshot of active connection" -msgstr "" - -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "" - -#: ../src/vinagre-ui.h:93 -msgid "View the current machine in full screen" -msgstr "" - -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "" - -#: ../src/vinagre-ui.h:112 +#: ../vinagre/vinagre-ui.h:74 msgid "_Toolbar" msgstr "పనిముట్ల పట్టా(_T)" -#: ../src/vinagre-ui.h:113 +#: ../vinagre/vinagre-ui.h:75 msgid "Show or hide the toolbar" msgstr "పనిముట్ల పట్టాను చూపుము లేదా దాయుము" -#: ../src/vinagre-ui.h:116 +#: ../vinagre/vinagre-ui.h:78 msgid "_Statusbar" msgstr "సుస్థితి పట్టీ (_S)" -#: ../src/vinagre-ui.h:117 +#: ../vinagre/vinagre-ui.h:79 msgid "Show or hide the statusbar" -msgstr "" +msgstr "స్థితిపట్టీను చూపుము లేదా మరుగునవుంచుము" -#: ../src/vinagre-ui.h:120 +#: ../vinagre/vinagre-ui.h:82 msgid "Side _Panel" -msgstr "" +msgstr "ప్రక్క ప్యానల్ (_P)" -#: ../src/vinagre-ui.h:121 +#: ../vinagre/vinagre-ui.h:83 msgid "Show or hide the side panel" -msgstr "" +msgstr "ప్రక్క ప్యానల్‌ను చూపుము లేదా మరుగునవుంచుము" + +#: ../vinagre/vinagre-ui.h:91 +msgid "Close the current connection" +msgstr "ప్రస్తుత అనుసంధానమును మూయుము" + +#: ../vinagre/vinagre-ui.h:92 +msgid "C_lose All" +msgstr "అన్నిటిని మూయుము (_l)" + +#: ../vinagre/vinagre-ui.h:93 +msgid "Close all active connections" +msgstr "అన్ని క్రియాశీల అనుసంధానములను మూయుము" -#: ../src/vinagre-utils.c:75 +#. Bookmarks menu +#: ../vinagre/vinagre-ui.h:96 +msgid "_Add to bookmarks" +msgstr "పుస్తకచిహ్నాలను జతచేయుము (_A)" + +#: ../vinagre/vinagre-ui.h:97 +msgid "Add current connection to your bookmarks" +msgstr "ప్రస్తుత అనుసంధానమును మీ పుస్తకచిహ్నాలకు జతచేయుము" + +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "తెరపట్టును తీసుకొనుము" + +#: ../vinagre/vinagre-ui.h:105 +msgid "Take a screenshot of active connection" +msgstr "క్రియాశీల అనుసంధానము యొక్క తెరపట్టును తీసుకొనుము" + +#: ../vinagre/vinagre-ui.h:109 +msgid "View the current machine in full screen" +msgstr "ప్రస్తుత మిషన్‌ను పూర్తితెర నందు చూడుము" + +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" -msgstr "" +msgstr "ఒక దోషము యెదురైంది:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "బుల్టర్ ఫైలును లోడుచేయలేక పోయింది: %s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre అనునది GNOME డెస్కుటాప్‌నకు దూరస్థ డెస్కుటాప్ దర్శని" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 "" +"వినాగ్రే ఉచిత సాఫ్ట్వేర్; నీవు దానిని మరలపంచవచ్చు స్వతంత్ర సాఫ్ట్వేర్ సంస్థ వెలువరిచిన GNU సర్వసామన్యమైన " +"ప్రజా లైసెన్సు వివరణం 2లైసెన్సు లేదా వేరే (మీ ఐచ్చికం వద్ద) వివరణల ప్రకారం మార్చవచ్చు." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre 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 "" +"వినాగ్రే ఉపయోగపడుతుందనే నమ్మకంతో పంపిణీచేయబడుతోంది,అయితే ఏ హామీ లేకుండా; వ్యాపారసంబందంగా కాని లేదా " +"ఒకనిర్దిష్ట అవసరానికిచెందినదని కాని హామీ లేదు. ఎక్కువ సమాచారంకొరకు GNU జనరల్ పబ్లిక్ లైసెన్స్ ను చూడండి." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -728,30 +962,26 @@ "మీరు GNU జనరల్ పబ్లిక్ లైసెన్స్‍ యొక్క నకలును ఈ ప్రోగ్రామ్ తోటి పొందుతారు. పొందక పోతే, చూడండి." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "KrishnaBabu K 2008." -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" -msgstr "" +msgstr "వినాగ్రే వెబ్‌సైట్" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" -msgstr "" +msgstr "vinagre-ui.xml ను మిళితం చేయలేదు: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" -msgstr "" +msgstr "ఇటీవలి అనుసంధానములు (_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" -msgstr "" - -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "" +msgstr "%s:%d తెరువుము" diff -Nru vinagre-2.26.1/po/tr.po vinagre-2.29.1/po/tr.po --- vinagre-2.26.1/po/tr.po 2009-04-13 14:28:57.000000000 +0100 +++ vinagre-2.29.1/po/tr.po 2009-08-30 12:14:28.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Vinagre\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-12 00:50+0300\n" -"PO-Revision-Date: 2009-04-12 00:49+0300\n" +"POT-Creation-Date: 2009-08-30 08:52+0300\n" +"PO-Revision-Date: 2009-08-30 08:50+0300\n" "Last-Translator: Baris Cicek \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" @@ -16,11 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Hakkında" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Yardım" @@ -29,124 +29,120 @@ msgstr "Uzak masaüstüne ulaş" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Uzak Masaüstü Görüntüleyici" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Kimlik denetimi gerekli" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Bağlantı seçenekleri" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "Bağlantı" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Klasör" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Arayüz" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Seçenekler" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Üst Klasör" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "Hangi makinaya bağlanmak istiyorsunuz?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Yukarıdakı tüm alanlar zorunludur" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Yukarıdakı tüm alanlar zorunludur" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Kimlik denetimi gerekli" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Yer imleri" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "Bağlantı" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Bağlantı seçenekleri" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Klasör" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Ana Bilgisayar:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Arayüz" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Seçenekler" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Üst Klasör" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Tercihler" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "Sadece bir etkin bağlantı olsa bile sekmelerin gösterilmesi" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "Hangi makinaya bağlanmak istiyorsunuz?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Menü hızlandırıcılarının (kısayol tuşları) gösterilmesi" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "Her zaman sekmeleri _göster" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "Kimliği _Doğrulama" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_Tam ekran" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Ana Bilgisayar:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_İsim:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Parola:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Protokol:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "Bu bilgileri _hatırla" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "Ö_lçekleme" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Menü kısayollarını göster" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Kullanıcı Adı:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "_Sadece görünüm" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Etkin eklentiler" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "makine ya da makine:ekran ya da makine:port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Etkin eklentiler listesi. Etkin eklentilerin \"Konum\"unu içerir. .vinagre-" +"plugin dosyasına belirli bir eklentinin \"Konum\"unu almak için bakın." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Bağlantı penceresinde azami sayıdaki geçmiş girişi" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -156,7 +152,7 @@ "için \"true\" atayın. Eğer etkinl olurlarda bu tuşlar menü tarafından " "algılanacak ve uzaktaki makineye gönderilmeyecekler." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -165,15 +161,15 @@ "birden daha fazla etkin bağlantı varken sekmelerin gösterilmesi için \"false" "\" olarak atayın." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Makine açılan girişinde azami sayıdaki öğeleri belirler." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "\"vnc://\" URL'leri için işleyici" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -184,10 +180,19 @@ "olarak atayarak diğer istemcilerle masaüstünün paylaşılmasını " "sağlayabilirsiniz." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Diğer istemcilerin bağlı olarak bırakılması" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Sadece bir etkin bağlantı olsa bile sekmelerin gösterilmesi" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Menü hızlandırıcılarının (kısayol tuşları) gösterilmesi" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Uzak Masaüstü(VNC) dosyası" @@ -196,90 +201,268 @@ msgid "Remote Desktop Connection" msgstr "Uzak Masaüstü Bağlantısı" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Unix/Linux Uçbirimlerine Erişim" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Port:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH desteği" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"'shared' imi için geçersiz değer: %d. 0 veya 1 olmalıdır. Yok sayılıyor." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Ölçekli kipi etkinleştir" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC Seçenekler:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "VNC Seçeneklerini Göster" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Unix/Linux, Windows ve diğer makineler erişim." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Dosya ayrıştırılamadı." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Dosya bir VNC dosyası değil: \"connection\" grubu eksik." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Dosya bir VNC dosyası değil: \"host\" anahtarı eksik." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC Seçenekleri" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "_Sadece görünüm" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "Ö_lçekleme" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC Dosyaları" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Masaüstü İsmi:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Boyutlar:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Ana bilgisayara bağlanırken hata." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "%s makinesine kimlik doğrulama yöntemi desteklenmiyor. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Kimlik doğrulama desteklenmiyor" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Kimlik doğrulama hatası" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "Bu makineye erişmek için bir kullanıcı ismi gereklidir." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Bu makineye erişmek için bir parola gereklidir." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "Ö_lçekleme" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Uzaktaki ekranı mevcut pencere boyutuna uydurur" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Fare ya da klavye olaylarını göndermez" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "Ö_zgün boyut" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Pencereyi uzaktaki masaüstünün boyutuna ayarlar" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Ctrl-Alt-Del Gönder" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Uzaktaki makineye Ctrl+Alt+Del gönder" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Ölçekleme" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Salt okunur" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Bu kurulumda ölçekleme desteklenmiyor.\n" +"\n" +"Bu özelliği etkinleştirmek için README dosyasını (Vinagre ile gelen) okuyun." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC desteği" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Uzaktaki makinelere hızlı erişim için bir menü" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Vinagre Uygulamacık Üreticisi" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Vinagre çalıştırılamadı:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Uzak Masaüstü Görüntüleyici Aç" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Yer imlerinize erişin" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Protokol %s desteklenmiyor" + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Yer imlerini başlatırken hata: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Bilinmeyen hata" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Yer imleri başlatılırken hata: Dosya boş gibi görünüyor" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "Yer imleri başlatılırken hata: Dosya vinagre yer imleri dosyası değil" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Yer imlerini kaydederken hata: XML yapısı oluşturulamadı" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Yer imlerini kaydederken hata: XML yapısı ilklendirilemedi" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Yer imlerini kaydederken hata: XML yapısı bitirilemedi" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Yer imlerini kaydederken hata: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "Yer imleri aktarılırken hata: XML yapısı oluşturulamadı" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "Yer imleri aktarılırken hata: XML yapısı ilklendirilemedi" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "Yer imleri aktarılırken hata: XML yapısı bitirilemedi" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Yer imleri aktarılırken hata: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Yer imleri aktarılırken hata: VNC eklentisi etkin değil" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Dizin oluşturulamadı" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -287,29 +470,29 @@ "Yer imleri yeni dosya biçimine aktarılıyor. Bu işlemin sadece bir kez " "çalıştırması gerekmektedir." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Eski yer imleri dosyası açarken hata: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Aktarma iptal edildi" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Eski yer imleri dosyası silinemedi" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Başlangıç Klasörü" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Bu klasörü için geçersiz isim" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." @@ -317,426 +500,450 @@ "Bu isim \"%s\" zaten bu klasör içinde kullanılıyor. Lütfen farklı bir isim " "kullanın." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Bu öğe için geçersiz isim" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Protokol: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Yer imlerinden %s kaldırmayı istediğinize emin misiniz?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Yer imlerinden %s kaldırmayı istediğinize emin misiniz?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Klasör Silinsin mi?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Tüm alt klasörler ve öğelerin de silineceğini dikkate alın." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Öğe Silinsin mi?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Yer imi silinirken hata: Giriş bulunamadı" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Yeni Klasör" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Dosya seçin" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Desteklenen biçimler" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Hiçbir desteklenen dosya yok" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Etkin eklentilerin hiçbiri açmak için desteklenen bir dosya sunmuyor. Bazı " +"eklentileri etkinleştirin ve yeniden deneyin." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Aşağıdaki dosya açılamadı." -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "Protokol listesinden aktif protokol alınamadı." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Geçmiş dosyası kaydederken hata: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Bir VNC Sunucusu seçin" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Protokol %s desteklenmiyor" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Uzak Masaüstü Seçin" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Dosya açılamadı." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Dosya ayrıştırılamadı." - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"'shared' imi için geçersiz değer: %d. 0 veya 1 olmalıdır. Yok sayılıyor." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Dosya hiçbir eklenti tarafından tanınmadı." -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Dosyadaki ana makine adresi bulunamadı." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Geçersiz işlem" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Sürükle ve bırak işleminden alınan veri geçersiz." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Yakındaki makineler" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Bir .vnc dosyası aç" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "dosyaismi" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Vinagre'yi tam ekran kipinde aç" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Mevcut vinagra oluşumuna bir yeni üst seviye pencere oluştur" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Vinagre tarafından tanınan bir dosya aç" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "dosyaismi" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[sunucu:port]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Aşağıdaki hata oluştu:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "GNOME için - VNC İstemcisi" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Uzak Masaüstü Görüntüleyici" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Mevcut komut satırı seçeneklerinin tam listesini görmek için 'vinagre --" "help' çalıştırın" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Avahi makine ismi çözümü başarısız oldu: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Eklenti %s zaten %s servisi için bir tarayıcı kaydetti" + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "%s servisi için mDNS tarayıcısı eklerken başarısız oldu." + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Makineler için göz atma başarısız oldu: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -msgid "Connection to host %s was closed." -msgstr "%s makinesine bağlantı kapatıldı." +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "mDNS tarayıcısı başlatılırken başarısız oldu: %s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "%s makinesine bağlantı kapatıldı." + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "Bağlantı kapatıldı" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "%s makinesine kimlik doğrulama başarılamadı" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Kimlik doğrulama başarısız" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "Bağlanıyor..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Bağlantıyı kapat" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Eklenti Yöneticisi" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Eklenti" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Etkin" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Yapılandır" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Etkinleştir" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "_Tümünü Etkinleştir" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "Tümünü _Devre Dışı Bırak" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "Eklenti _Hakkında" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "Eklentiyi _Yapılandır" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "Tercihler yöneticisi başlatılamadı." -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Ana bilgisayara bağlanırken hata." - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "%s makinesine kimlik doğrulama başarılamadı" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Tam ekranı terket" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Kimlik doğrulama başarısız" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "%s makinesine kimlik doğrulama yöntemi desteklenmiyor. (%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Kimlik doğrulama desteklenmiyor" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Son bağlantı kaydedilirken hata." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "Anahtarlık üzerine kimlik bilgileri kaydederken hata." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Kimlik doğrulama hatası" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "Bu makineye erişmek için bir kullanıcı ismi gereklidir." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Bu makineye erişmek için bir parola gereklidir." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Pencere küçült" - -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Ölçekleme" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Bağlantının ekran görüntüsü alınamadı." -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Salt okunur" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Ekran görüntülerini kaydet" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Ekran görüntüsü al" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s'nin ekran görüntüsü" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del Gönder" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Ekran görüntüsü kaydedilirken hata." -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Masaüstü İsmi:" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Servis mülkü almak imkansız: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Port:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Bağlantı oluşturmak mümkün değil: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Boyutlar:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Akış tüpü kabul etmek imkansız: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Bağlantının ekran görüntüsü alınamadı." +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Bağlantı adını almak imkansız: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:498 #, c-format -msgid "Screenshot of %s" -msgstr "%s'nin ekran görüntüsü" +msgid "Impossible to get the avatar: %s" +msgstr "Avatar almak imkansız: %s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Ekran görüntülerini kaydet" +#: ../vinagre/vinagre-tube-handler.c:519 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s sizinle masaüstünü paylaşmak istiyor." -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Bu kurulumda ölçekleme desteklenmiyor.\n" -"\n" -"Bu özelliği etkinleştirmek için README dosyasını (Vinagre ile gelen) okuyun." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "Masaüstü paylaşım daveti" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Makine" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Düzenle" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Görünüm" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Yer imleri" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "Uzaktaki bir makineye bağlan" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Bir .VNC dosyası aç" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Programdan çık" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Uygulama tercihlerini düzenle" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Yer imini aç" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "Bu makineye bağlan" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Yer imini düzenle" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "_Seçilen yer iminin ayrıntılarını düzenle" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "_Yer imlerinden kaldır" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Seçilen bağlantıyı yer imlerinden kaldır" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "_Yeni Klasör" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Yeni bir klasör oluştur" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_İçerikler" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Vinagre el kitabını aç" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Bu uygulama hakkında" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Araç Çubuğu" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Araç çubuğunu gizle ya da göster" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Durum Çubuğu" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Durum çubuğunu gizle ya da göster" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Kenar _Paneli" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Yan paneli göster ya da gizle" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Mevcut bağlantıyı kapat." -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "_Hepsini Kapat" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Bütün etkin bağlantıları kapat" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Yer imlerine ekle" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Mevcut bağlantıyı yer imlerinize ekleyin" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Ekran görüntüsü al" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Etkin bağlantının bir ekran görüntüsünü al" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Etkin bağlantıya Ctrl+Alt+Del gönder" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Mevcut makineyi tam ekran görüntüle" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "Ö_zgün boyut" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Pencereyi uzaktaki masaüstünün boyutuna ayarlar" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "Ö_lçekleme" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Uzaktaki ekranı mevcut pencere boyutuna uydur" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Salt okunur" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Fareyi ya da klavyeyi etkinsizleştir" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Araç Çubuğu" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Araç çubuğunu gizle ya da göster" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Durum Çubuğu" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Durum çubuğunu gizle ya da göster" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Kenar _Paneli" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Yan paneli göster ya da gizle" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Bir hata oluştu:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre GNOME Masaüstü için bir VNC istemcisidir." +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "İnşa edici dosya yüklenemedi: %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre GNOME Masaüstü için bir uzaktaki masaüstü görüntüleyicidir." -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -747,7 +954,7 @@ "vakfı tarafından yayınlanan GNU Genel Kamu Lisansının sürüm 2 veya (sizin " "seçiminiz) daha sonrakisürümlerinin şartları altında değiştirebilirsiniz." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -759,7 +966,7 @@ "etmedendağıtılmaktadır. Ayrıntılı bilgi için GNU Genel Kamu Lisansına " "bakınız." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -767,29 +974,25 @@ "Bu programla birlikte GNU Genel Kamu Lisansının bir kopyasını almış " "olmalısınız Eğer yoksa, adresine bakınız." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "Barış Çiçek " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre Web sayfası" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "vinagre-ui.xml %s birleştirilemedi" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Son bağlantılar" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "%s'yi Aç:%d" - -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "İmleci bırakmak için Ctrl+Alt tuşlarına basınız." diff -Nru vinagre-2.26.1/po/uk.po vinagre-2.29.1/po/uk.po --- vinagre-2.26.1/po/uk.po 2009-04-04 12:06:52.000000000 +0100 +++ vinagre-2.29.1/po/uk.po 2009-09-17 18:31:01.000000000 +0100 @@ -3,25 +3,26 @@ # # Maxim Dziumanenko , 2008. # Oleksandr Kovalenko , 2009. +# wanderlust , 2009. msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-31 15:24+0300\n" -"PO-Revision-Date: 2009-03-31 15:09+0200\n" -"Last-Translator: Oleksandr Kovalenko \n" -"Language-Team: Ukrainian \n" +"POT-Creation-Date: 2009-09-17 19:20+0300\n" +"PO-Revision-Date: 2009-07-08 13:03+0300\n" +"Last-Translator: wanderlust \n" +"Language-Team: ukrainian >\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "_Про програму" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "_Довідка" @@ -30,124 +31,120 @@ msgstr "Доступ до віддалених робочих столів" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "Перегляд віддалених робочих столів" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "Необхідна автентифікація" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "Параметри з'єднання" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "З'єднання" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "Тека" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "Інтерфейс" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "Параметри" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "Батьківська тека" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "З якою машиною ви хочете з'єднатися?" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "Всі поля нижче є обов'язковими" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "Всі поля нижче є обов'язковими" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "Необхідна автентифікація" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "Закладки" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "З'єднання" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "Параметри з'єднання" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "Тека" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "Вузол:" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "Інтерфейс" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "Параметри" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "Батьківська тека" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "Налаштування" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "Чи показувати вкладки при одному активному з'єднанні" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "З якою машиною ви хочете з'єднатися?" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "Чи показувати прискорювачі меню (комбінації клавіш)" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "_Завжди показувати вкладки" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "_Автентифікувати" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "_На весь екран" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "_Вузол:" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "_Ім'я:" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "_Пароль:" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "_Протокол:" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "_Запам'ятати цей пароль" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "_Масштаб" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "_Показати скорочення клавіш у меню" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "_Ім'я користувача:" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "Лише _перегляд" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "Активні модулі" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "host або host:display або host::port" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"Список активних модулів. Він містить «Адреси» активних модулів. " +"Адресу модуля можна побачити у файлі .vinagre-plugin у полі \"Location\"." -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "Мінімальне число елементів історії у діалозі з'єднання" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -157,7 +154,7 @@ "вмикає їх. Якщо вони увімкнені, ці комбінації клавіш перехоплюються меню та " "не передаються віддаленій системі." -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -165,15 +162,15 @@ "Встановити у \"true\" щоб завжди показувати вкладки. Встановіть \"false\" " "для показу вкладок, лише якщо є більш ніж одне активне з'єднання." -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "Вказує максимальну кількість елементів у розкривному списку вузлів." -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "Обробник для \"vnc://\" URLs" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -183,10 +180,19 @@ "клієнтів з'єднаними, чи розірвати існуючі з'єднання. Встановіть значення у " "true для спільного доступу разом з іншими клієнтами." -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "Чи залишати з'єднання інших клієнтів" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "Чи показувати вкладки при одному активному з'єднанні" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "Чи показувати прискорювачі меню (комбінації клавіш)" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "Файл віддаленого робочого стола (VNC)" @@ -195,93 +201,274 @@ msgid "Remote Desktop Connection" msgstr "З'єднання з віддаленим робочим столом" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "Доступ до терміналів Unix/Linux" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "Порт:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "Підтримка SSH" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "" +"Невірне значення для прапору 'спільний': %d. Воно має бути 0 чи 1. " +"Пропускаємо." + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "Увімкнути масштабований режим" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "Параметри VNC:" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "Показати параметри VNC" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "Доступ до Unix/Linux, Windows та інших машин." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "Неможливо розібрати файл." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "Файл не є VNC-файлом: Відсутня група \"connection\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "Файл не є VNC-файлом: Відсутній ключ \"host\"." + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "Параметри VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "Лише _перегляд" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "_Масштаб" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "Файли VNC" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "Назва стільниці:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "Роздільна здатність:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "Помилка підключення до вузла." + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "Метод автентифікації на вузлі %s не підтримується. (%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "Метод автентифікації не підтримується" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "Помилка автентифікації" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "" +"Ім'я користувача необхідне, щоб належним чином отримати доступ до машини." + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "Пароль необхідне, щоб належним чином отримати доступ до машини." + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "_Масштаб" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "Вмістити віддалену стільницю у розміри поточного вікна" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "Лише перегляд" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "_Початковий розмір" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "Підігнати розміри вікна до розміру віддаленої стільниці" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "Надіслати Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "Надіслати Ctrl+Alt+Del віддаленому ПК" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "Масштаб" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "Лише читання" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"Масштаб не підтримується цією збіркою.\n" +"\n" +"Прочитайте файл README (що постачається з Vinagre), щоб дізнатись як " +"увімкнути цю функцію." + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "Підтримка VNC" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "Меню для швидкого доступу до віддалених машин" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr "Фабрика аплету Vinagre" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "Не вдається запустити vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "Відкрити перегляд віддаленого робочого столу" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "Доступ до закладок" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253 +#, c-format +msgid "The protocol %s is not supported." +msgstr "Протокол %s не підтримується." + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "Помилка ініціалізації закладок: %s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "Невідома помилка" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "Помилка ініціалізації закладок: здається, що файл порожній" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "Помилка ініціалізації закладок: файл не є файлом закладок vinagre" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "Помилка збереження закладок: неможливо створити структуру XML" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "Помилка збереження закладок: неможливо встановити структуру XML" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "Помилка збереження закладок: неможливо завершити структуру XML" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "Помилка збереження закладок: %s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "" "Помилка під час міграції закладинок: не вдається створити структуру XML" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "" "Помилка під час міграції закладинок: не вдається визначити структуру XML" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "" "Помилка під час міграції закладинок: не вдається завершити структуру XML" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "Помилка під час міграції закладок: %s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "Помилка під час міграції закладок: модуль VNC не активовано" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "Не вдається створити теку" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." @@ -289,29 +476,29 @@ "Міграція файлу закладок у новий формат. Припускається, що ця операція " "виконується лише один раз." -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "Помилка відкриття старого файлу закладок: %s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "Міграція відмінена" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "Неможливо вилучити старий файл з закладками" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "Коренева тека" -#: ../src/vinagre-bookmarks-ui.c:79 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "Невірна назва для цієї теки" -#: ../src/vinagre-bookmarks-ui.c:89 ../src/vinagre-bookmarks-ui.c:191 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 #, c-format msgid "" "The name \"%s\" is already used in this folder. Please use a different name." @@ -319,114 +506,124 @@ "Назва \"%s\" вже використовується для цієї теки. Будь ласка, виберіть іншу " "назву." -#: ../src/vinagre-bookmarks-ui.c:90 ../src/vinagre-bookmarks-ui.c:181 -#: ../src/vinagre-bookmarks-ui.c:192 +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 msgid "Invalid name for this item" msgstr "Невірна назва для цього елементу" -#: ../src/vinagre-bookmarks-ui.c:292 +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 +#, c-format +msgid "(Protocol: %s)" +msgstr "(Протокол: %s)" + +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "Ви справді хочете видалити %s із закладок?" +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "Ви справді хочете видалити %s із закладок?" -#: ../src/vinagre-bookmarks-ui.c:297 +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "Вилучити теку?" -#: ../src/vinagre-bookmarks-ui.c:298 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "Зауважте, що всі її підтеки та елементи будуть вилучені також." -#: ../src/vinagre-bookmarks-ui.c:303 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "Вилучити елемент?" -#: ../src/vinagre-bookmarks-ui.c:320 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "Помилка вилучення закладки: елемент не знайдений" -#: ../src/vinagre-bookmarks-ui.c:337 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "Нова тека" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "Виберіть файл" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "Підтримувані формати" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "Немає підтримуваних файлів" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"Ходен з активних модулів не пропонує відкрити підтримуваний. Активувати деякі модулі та спробувати знову." + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "Наступний файл може бути відкритий:" msgstr[1] "Наступні файли можуть бути відкриті:" msgstr[2] "Наступні файли можуть бути відкриті:" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:428 +msgid "Could not get the active protocol in the protocol list." +msgstr "Не вдається отримати активний протокол зі списку протоколів." + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "Помилка при збереженні файлу історії: %s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "Виберіть сервер VNC" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "Протокол %s не підтримується." +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "Виберіть віддалений робочий стіл" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "Неможливо відкрити файл." -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "Неможливо розібрати файл." +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "Файл не розпізнаний ходним з модулів." -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "" -"Невірне значення для прапору 'спільний': %d. Воно має бути 0 чи 1. " -"Пропускаємо." - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "Не вдалося знайти адресу вузла в файлі." - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "Невірна дія" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "Дані, що отримані від операції drag&drop невірні." -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "Вузли навколо" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "Відкрити файл .vnc" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "Відкрити vinagre у повноекранному режимі" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "назва файлу" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "Створити нове вікно існуючого екземпляра програми vinagre" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "Відкрити файл, що розпізнається vinagre" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "назва файлу" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[сервер:порт]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "Виникла наступна помилка:" @@ -434,318 +631,328 @@ msgstr[2] "Виникли наступні помилки:" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- клієнт VNC для GNOME" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- Перегляд віддалених робочих столів" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "" "Запустіть 'vinagre --help', щоб переглянути список доступних параметрів " "командного рядка" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:144 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "Помилка при визначенні назви вузла avahi: %s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:202 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "Модуль %s вже зареєстрував оглядача для служби %s." + +#: ../vinagre/vinagre-mdns.c:211 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "Помилка при додаванні mDNS для служби %s." + +#: ../vinagre/vinagre-mdns.c:227 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "Помилка при перегляді вузлів hosts: %s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:300 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "Помилка при ініціалізації перегляду вузлів mDNS: %s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "З'єднання з вузлом %s було завершене." +msgid "Connection to host %s was closed." +msgstr "З'єднання з вузлом %s було завершене." -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "З'єднання завершене" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "Помилка автентифікації на вузлі %s" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "Помилка автентифікації" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "З'єднання..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "Закрити з'єднання" -#: ../src/vinagre-prefs.c:169 -msgid "Cannot initialize preferences manager." -msgstr "Не вдається ініціалізувати менеджер параметрів." - -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "Помилка підключення до вузла." +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "Менеджер модулів" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "Модуль" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "Увімкнено" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "_Налаштувати" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "_Активувати" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "Активувати _усі" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "_Деактивувати всі" -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "Помилка автентифікації на вузлі %s" +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "_Про програму" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "Помилка автентифікації" +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "На_лаштувати модуль" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "Метод автентифікації на вузлі %s не підтримується. (%u)" +#: ../vinagre/vinagre-prefs.c:227 +msgid "Cannot initialize preferences manager." +msgstr "Не вдається ініціалізувати менеджер параметрів." -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "Метод автентифікації не підтримується" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "Вийти з повноекранного режиму" -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "Помилка збереження останнього з'єднання." -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." -msgstr "Помилка збереження паролю у в'язці ключів." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." +msgstr "Помилка збереження мандату у в'язці ключів." -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "Помилка автентифікації" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "" -"Ім'я користувача необхідне, щоб належним чином отримати доступ до машини." - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "Пароль необхідне, щоб належним чином отримати доступ до машини." - -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "Мінімізувати вікно" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "Не вдається отримати знімок екрану з'єднання." -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "Масштаб" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "Зберегти знімок екрану" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "Лише читання" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "Знімок екрану %s" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "Зробити знімок екрану" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "Помилка при збереженні знімку екрану." -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "Надіслати Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:229 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "Неможливо отримати властивість служби: %s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "Назва стільниці:" +#: ../vinagre/vinagre-tube-handler.c:286 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "Неможливо створити з'єднання: %s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "Порт:" +#: ../vinagre/vinagre-tube-handler.c:325 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "Неможливо отримати доступ до потоку тунелю: %s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "Роздільна здатність:" +#: ../vinagre/vinagre-tube-handler.c:463 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "Неможливо отримати назву контакту: %s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "Не вдається отримати знімок екрану з'єднання." +#: ../vinagre/vinagre-tube-handler.c:498 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "Неможливо отримати атавар: %s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:519 #, c-format -msgid "Screenshot of %s" -msgstr "Знімок екрану %s" +msgid "%s wants to share his desktop with you." +msgstr "%s бажає надати вам доступ до спільного робочого столу." -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "Зберегти знімок екрану" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"Масштаб не підтримується цією збіркою.\n" -"\n" -"Прочитайте файл README (що постачається з Vinagre), щоб дізнатись як " -"увімкнути цю функцію." +#: ../vinagre/vinagre-tube-handler.c:524 +msgid "Desktop sharing invitation" +msgstr "запрошення до спільного робочого столу" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "_Машина" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "_Правка" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "_Вигляд" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "_Закладки" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "З'єднатися з віддаленою машиною" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "Відкрити файл .VNC" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "Вийти з програми" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "Редагувати налаштування програми" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "_Відкрити закладку" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "З'єднатися з цією машиною" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "_Змінити закладку" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "Змінити параметри виділеної закладки" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "В_идалити із закладок" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "Видалити поточне виділене з'єднання із закладок" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "Нова _тека" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "Створити нову теку" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "_Зміст" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "Відрити посібник з Vinagre" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "Про цю програму" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "_Панель інструментів" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "Відобразити чи сховати панель інструментів" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "_Рядок стану" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "Відобразити чи сховати рядок стану" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "Бічна _панель" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "Показати чи сховати бічну закладок" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "Закрити поточне з'єднання" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "З_акрити все" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "Закрити всі активні з'єднання" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "_Додати до закладок" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "Додати поточне з'єднання до закладок" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "Зробити знімок екрану" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "Зробити знімок екрану активного з'єднання" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "Надіслати Ctrl+Alt+Del активному з'єднанню" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "Переглянути поточну машину у повноекранному режимі" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "_Початковий розмір" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "Підігнати розміри вікна до розміру віддаленої стільниці" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "_Масштаб" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "Підігнати віддалений робочий стіл до розмірів поточного вікна" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "_Лише читання" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "Вимкнути мишу та клавіатуру" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "_Панель інструментів" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "Відобразити чи сховати панель інструментів" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "_Рядок стану" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "Відобразити чи сховати рядок стану" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "Бічна _панель" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "Показати чи сховати бічну закладок" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "Виникла помилка:" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "Не вдається завантажити файл : %s" + +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" msgstr "Vinagre - клієнт VNC для робочого середовища GNOME" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -756,7 +963,7 @@ "умовах Універсальної суспільної ліцензії GNU версії 2 або будь-якій старшій " "версії." -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -768,7 +975,7 @@ "КОМЕРЦІЙНОЇ ЦІННОСТІ ТА ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ. Додаткові відомості " "наведено у ліцензії GNU General Public License." -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -776,89 +983,29 @@ "З цією програмою ви мали б отримати копію GNU General Public License, якщо " "це не так - дивіться ." -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "Максим Дзюманенко ,\n" "Oleksandr Kovalenko " -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Сайт Vinagre" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "Не вдається підключити vinagre-ui.xml: %s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "_Недавні з'єднання" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "Відкрити %s:%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "Натисніть Ctrl+Alt, щоб відпустити курсор" - -#~ msgid "Editing a bookmark" -#~ msgstr "Редагування закладки" - -#~ msgid "Enter a name for this connection" -#~ msgstr "Введіть назву для цього з'єднання" - -#~ msgid "" -#~ "In order to connect on this machine, a password is required. Please " -#~ "supply it." -#~ msgstr "" -#~ "Для підключення до цієї машини потрібен пароль. Введіть його." - -#~ msgid "Editing a bookmark" -#~ msgstr "Редагування закладки" - -#~ msgid "Saving to bookmarks" -#~ msgstr "Зберегти до закладок" - -#~ msgid "_Bookmark name:" -#~ msgstr "Назва _закладки:" - -#~ msgid "Error: %s" -#~ msgstr "Помилка: %s" - -#~ msgid "Confirm removal?" -#~ msgstr "Підтвердити видалення?" - -#~ msgid "Error while removing %s from bookmarks: %s" -#~ msgstr "Помилка при видаленні %s із закладок: %s" - -#~ msgid "" -#~ "Scaling does not work properly on composited windows. Disable the visual " -#~ "effects and try again." -#~ msgstr "" -#~ "Масштаб некоректно працює на композитних вікнах. Вимкніть візуальні " -#~ "ефекти та спробуйте ще раз" - -#~ msgid "_Port:" -#~ msgstr "_Порт:" - -#~ msgid "Image" -#~ msgstr "Зображення" - -#~ msgid "Name" -#~ msgstr "Назва" - -#~ msgid "Hide bookmarks" -#~ msgstr "Сховати закладки" - -#~ msgid "Expected `%s' got `%s' for key %s" -#~ msgstr "Очікувалось `%s', отримано `%s' для ключа %s" - -#~ msgid "Press Ctrl+Alt to grab the cursor" -#~ msgstr "Натисніть Ctrl+Alt для перехоплення курсору" -#~ msgid "Could not initialize GnomeVFS\n" -#~ msgstr "Не вдається ініціалізувати GnomeVFS\n" diff -Nru vinagre-2.26.1/po/zh_HK.po vinagre-2.29.1/po/zh_HK.po --- vinagre-2.26.1/po/zh_HK.po 2009-02-26 17:44:19.000000000 +0000 +++ vinagre-2.29.1/po/zh_HK.po 2009-08-22 14:29:39.000000000 +0100 @@ -5,22 +5,23 @@ # msgid "" msgstr "" -"Project-Id-Version: vinagre 2.25.92\n" +"Project-Id-Version: vinagre 2.27.90\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-25 21:20+0800\n" -"PO-Revision-Date: 2009-02-25 21:21+0800\n" +"POT-Creation-Date: 2009-08-22 15:54+0800\n" +"PO-Revision-Date: 2009-08-22 15:54+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \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-Poedit-Bookmarks: -1,103,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "關於(_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "求助(_H)" @@ -29,155 +30,158 @@ msgstr "存取遠端桌面" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "遠端桌面檢視器" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "需要驗證" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "連線選項" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "連線" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "資料夾" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "介面" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "選項" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "上層資料夾" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "你想連線到哪個機器？" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "上面所有欄位都是必要的" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "上面所有欄位都是必要的" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "需要驗證" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "書籤" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "連線" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "連線選項" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "資料夾" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "主機：" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "介面" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "選項" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "上層資料夾" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "偏好設定" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "是否要在只使用一個連線時顯示分頁" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "你想連線到哪個機器？" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "是否顯示選單加速鍵（捷徑鍵）" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "永遠顯示分頁(_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "驗證(_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "全螢幕(_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "主機(_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "名稱(_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "密碼(_P):" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "通訊協定(_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "記住這個證書(_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "縮放(_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "顯示選單捷徑鍵(_S)" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "使用者名稱(_U):" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "只有檢視(_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "使用中外掛程式" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "主機 或 主機:畫面 或 主機::連接埠" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "可用的外掛程式的清單。這包括可用的外掛程式的「位置」。參閱 .vinagre-plugin 檔來取得特定的外掛程式的「位置」。" -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "連線對話盒最歷史紀錄項目的最大數量" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " "and will not be sent to the remote host." msgstr "設為「false」會停用選單捷徑鍵。設為「true」則會啟用它們。注意如果啟用它們，這些捷徑鍵會被選單攔截，而不會傳送至遠端主機。" -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." msgstr "設為「true」則永遠顯示分頁。設為「false」則只有在同時使用一個以上的連線時顯示分頁。" -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "指定在主機下拉式項目中所顯示項目的最大數目。" -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "「vnc://」網址的處理程式" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " "to share the desktop with the other clients." msgstr "當連線到主機時，此客戶端程式可以要求該伺服器保留其他已連線的客戶端或者中斷既存的連線。將這個數值設為 true 可以與其他客戶端程式共同使用桌面。" -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "是否保留其他已連線的客戶端程式" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "是否要在只使用一個連線時顯示分頁" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "是否顯示選單加速鍵（捷徑鍵）" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "遠端桌面(VNC)文件" @@ -186,531 +190,751 @@ msgid "Remote Desktop Connection" msgstr "遠端桌面連線" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "存取 Unix/Linux 終端機" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "連接埠:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH 支援" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "「shared」旗標數值錯誤：%d。它應該為 0 或 1。只能忽略此數值。" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "啟用縮放模式" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC 選項：" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "顯示 VNC 選項" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "存取 Unix/Linux、Windows 和其他電腦。" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "無法解析該檔案。" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "該檔案並非 VNC 檔案：缺少羣組「connection」。" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "該檔案並非 VNC 檔案：缺少設定鍵「host」。" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC 選項" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "只有檢視(_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "縮放(_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC 檔案" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "桌面名稱：" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "尺寸:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "連線到主機時錯誤。" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "不支持到主機 %s 的驗證方法。(%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "不支援的驗證方法" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "驗證錯誤" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "為了存取這個電腦需要使用者名稱。" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "為了存取這個電腦需要密碼。" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "縮放(_C)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "讓遠端螢幕能符合目前的視窗大小" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "不要送出滑鼠與鍵盤事件" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "原始大小(_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "將視窗調整為遠端桌面的大小" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "傳送 Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "傳送 Ctrl+Alt+Del 到遠端機器" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "正在縮放" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "唯讀" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"縮放功能在這個安裝狀態下並不支援。\n" +"\n" +"請閱讀 README 檔案（隨附在 Vinagre 裏）以了解如何啟用這個功能。" + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC 支援" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "用來快速連線到遠端機器的選單" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr " Vinagre 面板程式工廠" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "無法執行 vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "開啟遠端桌面檢視器" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "存取你的書籤" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256 +#, c-format +msgid "The protocol %s is not supported." +msgstr "未支援通訊協定 %s 。" + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "初始化書籤時錯誤：%s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "不明的錯誤" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "初始化書籤時發生錯誤：該檔案似乎是空的" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "初始化書籤時發生錯誤：該檔案並非 vinagre 書籤檔案" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "儲存書籤時發生錯誤：建立 XML 結構失敗" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "儲存書籤時發生錯誤：初始化 XML 結構失敗" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "儲存書籤時發生錯誤：結束 XML 結構失敗" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "儲存書籤時錯誤：%s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "在轉移書籤時發生錯誤：建立 XML 結構失敗" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "在轉移書籤時發生錯誤：初始化 XML 結構失敗" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "在轉移書籤時發生錯誤：結束 XML 結構失敗" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "轉移書籤時發生錯誤：%s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "轉移書籤時發生錯誤：尚未使用 VNC 外掛程式" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "建立目錄失敗" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." msgstr "正在將書籤檔案轉移為新的格式。這個操作只能執行一次。" -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "開啟舊的書籤檔案時發生錯誤：%s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "轉移程序已取消" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "無法移除舊的書籤檔案" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "根資料夾" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "這個資料夾的名稱無效" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "這個目錄內已經有名為「%s」的項目。請使用其他名稱。" + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "這個項目的名稱無效" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "你確認想從書籤中移除%s？" +msgid "(Protocol: %s)" +msgstr "(通訊協定：%s)" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "你確定想從書籤中移除 %s？" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "是否移除資料夾？" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "注意它所有的子資料夾和項目也會被移除。" -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "是否移除項目？" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "移除書籤時發生錯誤：找不到項目" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "新增資料夾" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "選擇文件" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "支援的格式" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "這裏沒有支援的檔案" + +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "使用中的外掛程式沒有提供可開啟的支援檔案。請使用其他外掛程式後再試一次。" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "無法開啟下列文件：" msgstr[1] "無法開啟下列文件：" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "無法在通訊協定清單中取得使用中的通訊協定。" + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "儲存歷史紀錄檔案時發生錯誤：%s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "選擇 VNC 伺服器" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "未支援通訊協定 %s 。" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "選擇一個遠端桌面" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "無法開啟該檔案。" -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "無法解析該檔案。" - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "「shared」旗標數值錯誤：%d。它應該為 0 或 1。只能忽略此數值。" - -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "在該檔案中找不到主機位址。" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "該檔案無法被任何外掛程式辨識。" -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "無效的操作" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "從拖放操作中取回的資料是無效的。" -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "臨近的主機" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "開啟 .vnc 文件" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "以全螢幕模式開啟 vinagre" -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "檔案名稱" - -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "在既存的 vinagre 實體中建立新的頂層視窗" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "開啟 vinagre 可辨識的檔案" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "檔案名稱" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[伺服器:埠口]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "發生下列錯誤：" msgstr[1] "發生下列錯誤：" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- GNOME 的 VNC 客戶端" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- 遠端桌面檢視器" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "執行「vinagre --help」以查看可用命令行選項的完整列表" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "解析 avahi 主機名稱失敗：%s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "外掛程式 %s 已被瀏覽器註冊用於服務 %s。" + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "將 mDNS 瀏覽器加入服務 %s失敗。" + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "瀏覽主機失敗：%s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 +#, c-format +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "初始化 mDNS 瀏覽器失敗：%s\n" + +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 #, c-format -msgid "Connection to host %s was closed." -msgstr "到主機 %s 的連線已關閉。" +msgid "Connection to host %s was closed." +msgstr "到主機 %s 的連線已關閉。" -#: ../src/vinagre-notebook.c:170 +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "連線已關閉" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "到主機 %s 的驗證失敗" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "驗證失敗" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "正在連線..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "關閉連線" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "外掛程式管理員" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "外掛程式" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "已啟用" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "設定(_O)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "使用(_C)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "使用全部(_T)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "全部不使用(_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "關於外掛程式(_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "設定外掛程式(_O)" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "無法初始化偏好設定管理員。" -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "連線到主機時錯誤。" - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "到主機 %s 的驗證失敗" - -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "驗證失敗" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "離開全螢幕" -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "不支持到主機 %s 的驗證方法。(%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "不支援的驗證方法" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "儲存最近連線時錯誤。" -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "儲存證書到密碼匙圈時發生錯誤。" -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "驗證錯誤" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "為了存取這個電腦需要使用者名稱。" - -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "為了存取這個電腦需要密碼。" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "無法取得此連線的畫面快照。" -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "最小化視窗" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "儲存畫面快照" -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "正在縮放" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s 的畫面快照" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "唯讀" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "儲存畫面快照時發生錯誤" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "擷取畫面快照" +#: ../vinagre/vinagre-tube-handler.c:232 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "不可能取得服務屬性：%s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "傳送 Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:289 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "不可能建立連線：%s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "桌面名稱：" +#: ../vinagre/vinagre-tube-handler.c:328 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "不可能接受串流管：%s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "連接埠:" +#: ../vinagre/vinagre-tube-handler.c:404 +#, c-format +msgid "Failed to request name: %s" +msgstr "要求名稱失敗：%s" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "尺寸:" +#: ../vinagre/vinagre-tube-handler.c:405 +msgid "No error given" +msgstr "沒有指定的錯誤" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "無法取得此連線的畫面快照。" +#: ../vinagre/vinagre-tube-handler.c:482 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "不可能取得聯絡人名稱：%s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:517 #, c-format -msgid "Screenshot of %s" -msgstr "%s 的畫面快照" +msgid "Impossible to get the avatar: %s" +msgstr "不可能取得大頭貼：%s" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "儲存畫面快照" +#: ../vinagre/vinagre-tube-handler.c:538 +#, c-format +msgid "%s wants to share his desktop with you." +msgstr "%s 想要與你分享他的桌面。" -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"縮放功能在這個安裝狀態下並不支援。\n" -"\n" -"請閱讀 README 檔案（隨附在 Vinagre 裏）以了解如何啟用這個功能。" +#: ../vinagre/vinagre-tube-handler.c:543 +msgid "Desktop sharing invitation" +msgstr "桌面共享邀請" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "機器(_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "編輯(_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "檢視(_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "書籤(_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "連線到遠端機器" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "開啟 .VNC 文件" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "結束程式" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "編輯應用程式偏好設定" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "開啟書籤(_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "連線到此機器" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "編輯書籤(_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "編輯所選擇書籤的細節" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "從書籤中移除(_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "從書籤中移除當前選擇的連線" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "新增資料夾(_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "建立新的資料夾" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "內容(_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "開啟 vinagre 手冊" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "關於此程式" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "工具列(_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "顯示或隱藏工具列" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "狀態列(_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "顯示或隱藏狀態列" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "側邊面板(_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "顯示或隱藏側邊面板" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "關閉當前連線" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "全部關閉(_L)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "關閉全部活動中的連線" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "新增至書籤(_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "新增目前連線至你的書籤" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "擷取畫面快照" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "擷取活動連線的畫面快照" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "傳送 Ctrl+Alt+Del 到活動中的連線" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "以全螢幕檢視當前機器" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "原始大小(_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "將視窗調整為遠端桌面的大小" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "縮放(_C)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "讓遠端螢幕能符合目前的視窗大小" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "唯讀(_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "停用滑鼠與鍵盤" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "工具列(_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "顯示或隱藏工具列" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "狀態列(_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "顯示或隱藏狀態列" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "側邊面板(_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "顯示或隱藏側邊面板" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "發生錯誤：" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre 是 GNOME 桌面的 VNC 客戶端" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "無法載入建置檔案：%s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre 是 GNOME 桌面的遠端桌面檢視器" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -718,7 +942,7 @@ "version." msgstr "Vinagre 是自由軟件；你可以在自由軟件基金會發行的 GNU 通用公共許可的條款下重新分發它和/或修改它；無論此許可的版本2，或者(以你的選擇)任何更新的版本。" -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -726,13 +950,13 @@ "details." msgstr "Vinagre 被發佈是希望它能夠有所用處，但「沒有任何保證」；甚至沒有隱含「可銷售」或者「用於特定用途」的保證。請查看 GNU 通用公共許可以獲得更多細節。" -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." msgstr "你應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，請參訪 。" -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "GNOME 程式中文化郵件論壇\n" @@ -740,28 +964,63 @@ "\n" "Hialan Liu , 2008" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre 網站" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "無法合併 vinagre-ui.xml：%s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "最近連線(_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "開啟 %s：%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "按 Ctrl+Alt 以釋放游標" +#~ msgid "Minimize window" +#~ msgstr "最小化視窗" + +#~ msgid "_Plugins" +#~ msgstr "外掛程式(_P)" + +#~ msgid "Select plugins" +#~ msgstr "選擇外掛程式" + +#~ msgid "Supported formats" +#~ msgstr "支援的格式" + +#~ msgid "Connection" +#~ msgstr "連線" + +#~ msgid "Folder" +#~ msgstr "資料夾" + +#~ msgid "host or host:display or host::port" +#~ msgstr "主機 或 主機:畫面 或 主機::連接埠" + +#~ msgid "Choose a VNC Server" +#~ msgstr "選擇 VNC 伺服器" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "在該檔案中找不到主機位址。" + +#~ msgid "Opens a .vnc file" +#~ msgstr "開啟 .vnc 文件" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- GNOME 的 VNC 客戶端" + +#~ msgid "_Read only" +#~ msgstr "唯讀(_R)" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "按 Ctrl+Alt 以釋放游標" #~ msgid "Editing a bookmark" #~ msgstr "編輯書籤" @@ -797,9 +1056,6 @@ #~ "effects and try again." #~ msgstr "縮放功能在組合式視窗中無法正確運作。請停用視覺效果後再試一次。" -#~ msgid "_Port:" -#~ msgstr "連接埠(_P):" - #~ msgid "Image" #~ msgstr "圖片" diff -Nru vinagre-2.26.1/po/zh_TW.po vinagre-2.29.1/po/zh_TW.po --- vinagre-2.26.1/po/zh_TW.po 2009-02-26 17:44:19.000000000 +0000 +++ vinagre-2.29.1/po/zh_TW.po 2009-08-22 14:29:39.000000000 +0100 @@ -5,22 +5,23 @@ # msgid "" msgstr "" -"Project-Id-Version: vinagre 2.25.92\n" +"Project-Id-Version: vinagre 2.27.90\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-25 21:20+0800\n" -"PO-Revision-Date: 2009-02-23 22:24+0800\n" +"POT-Creation-Date: 2009-08-22 15:54+0800\n" +"PO-Revision-Date: 2009-08-22 15:32+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Traditional) \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-Poedit-Bookmarks: -1,103,-1,-1,-1,-1,-1,-1,-1,-1\n" -#: ../data/GNOME_VinagreApplet.xml.h:1 +#: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495 msgid "_About" msgstr "關於(_A)" -#: ../data/GNOME_VinagreApplet.xml.h:2 ../src/vinagre-ui.h:37 +#: ../data/GNOME_VinagreApplet.xml.h:2 ../vinagre/vinagre-ui.h:37 msgid "_Help" msgstr "求助(_H)" @@ -29,124 +30,120 @@ msgstr "存取遠端桌面" #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2 -#: ../src/GNOME_VinagreApplet.server.in.in.h:2 ../src/vinagre-applet.c:418 -#: ../src/vinagre-applet.c:473 ../src/vinagre-main.c:151 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2 +#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486 +#: ../vinagre/vinagre-main.c:198 msgid "Remote Desktop Viewer" msgstr "遠端桌面檢視器" -#: ../data/vinagre.glade.h:1 -msgid "Authentication is required" -msgstr "需要驗證" - -#: ../data/vinagre.glade.h:2 -msgid "Connection options" -msgstr "連線選項" - -#: ../data/vinagre.glade.h:3 -msgid "Connection" -msgstr "連線" - -#: ../data/vinagre.glade.h:4 -msgid "Folder" -msgstr "資料夾" - -#: ../data/vinagre.glade.h:5 -msgid "Interface" -msgstr "介面" - -#: ../data/vinagre.glade.h:6 -msgid "Options" -msgstr "選項" - -#: ../data/vinagre.glade.h:7 -msgid "Parent Folder" -msgstr "上層資料夾" - -#: ../data/vinagre.glade.h:8 -msgid "Which machine do you want to connect to?" -msgstr "您想連線到哪個機器？" - -#: ../data/vinagre.glade.h:9 -msgid "All fields above are mandatory" -msgstr "上面所有欄位都是必要的" +#: ../data/vinagre.ui.h:1 +msgid "All fields above are mandatory" +msgstr "上面所有欄位都是必要的" + +#: ../data/vinagre.ui.h:2 +msgid "Authentication is required" +msgstr "需要驗證" -#: ../data/vinagre.glade.h:10 ../src/vinagre-fav.c:846 +#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856 msgid "Bookmarks" msgstr "書籤" -#: ../data/vinagre.glade.h:11 ../src/vinagre-fav.c:422 -#: ../src/vinagre-tab.c:1062 +#: ../data/vinagre.ui.h:4 +msgid "Connection" +msgstr "連線" + +#: ../data/vinagre.ui.h:5 +msgid "Connection options" +msgstr "連線選項" + +#: ../data/vinagre.ui.h:6 +msgid "Folder" +msgstr "資料夾" + +#: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49 +#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425 msgid "Host:" msgstr "主機：" -#: ../data/vinagre.glade.h:12 +#: ../data/vinagre.ui.h:8 +msgid "Interface" +msgstr "介面" + +#: ../data/vinagre.ui.h:9 +msgid "Options" +msgstr "選項" + +#: ../data/vinagre.ui.h:10 +msgid "Parent Folder" +msgstr "上層資料夾" + +#: ../data/vinagre.ui.h:11 msgid "Preferences" msgstr "偏好設定" -#: ../data/vinagre.glade.h:13 ../data/vinagre.schemas.in.h:8 -msgid "" -"Whether we should show tabs even when there is only one active connection" -msgstr "是否要在只使用一個連線時顯示分頁" +#: ../data/vinagre.ui.h:12 +msgid "Which machine do you want to connect to?" +msgstr "您想連線到哪個機器？" -#: ../data/vinagre.glade.h:14 ../data/vinagre.schemas.in.h:9 -msgid "Whether we should show the menu accelerators (shortcut keys)" -msgstr "是否顯示選單加速鍵（捷徑鍵）" - -#: ../data/vinagre.glade.h:15 +#: ../data/vinagre.ui.h:13 msgid "_Always show tabs" msgstr "永遠顯示分頁(_A)" #. This is a button label, in the authentication dialog -#: ../data/vinagre.glade.h:17 +#: ../data/vinagre.ui.h:15 msgid "_Authenticate" msgstr "驗證(_A)" -#: ../data/vinagre.glade.h:18 +#: ../data/vinagre.ui.h:16 msgid "_Full screen" msgstr "全螢幕(_F)" -#: ../data/vinagre.glade.h:19 +#: ../data/vinagre.ui.h:17 msgid "_Host:" msgstr "主機(_H):" -#: ../data/vinagre.glade.h:20 +#: ../data/vinagre.ui.h:18 msgid "_Name:" msgstr "名稱(_N):" -#: ../data/vinagre.glade.h:21 +#: ../data/vinagre.ui.h:19 msgid "_Password:" msgstr "密碼(_P):" -#: ../data/vinagre.glade.h:22 +#: ../data/vinagre.ui.h:20 +msgid "_Protocol:" +msgstr "通訊協定(_P):" + +#: ../data/vinagre.ui.h:21 msgid "_Remember this credential" msgstr "記住這個憑證(_R)" -#: ../data/vinagre.glade.h:23 -msgid "_Scaling" -msgstr "縮放(_S)" - -#: ../data/vinagre.glade.h:24 +#: ../data/vinagre.ui.h:22 msgid "_Show menu shortcuts" msgstr "顯示選單捷徑鍵(_S)" -#: ../data/vinagre.glade.h:25 +#: ../data/vinagre.ui.h:23 msgid "_Username:" msgstr "使用者名稱(_U):" -#: ../data/vinagre.glade.h:26 -msgid "_View only" -msgstr "只有檢視(_V)" +#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795 +msgid "Active plugins" +msgstr "使用中外掛程式" -#. Tooltip for host entry in connect dialog -#: ../data/vinagre.glade.h:28 -msgid "host or host:display or host::port" -msgstr "主機 或 主機:畫面 或 主機::連接埠" +#: ../data/vinagre.schemas.in.in.h:2 +msgid "" +"List of active plugins. It contains the \"Location\" of the active plugins. " +"See the .vinagre-plugin file for obtaining the \"Location\" of a given " +"plugin." +msgstr "" +"可用的外掛程式的清單。這包括可用的外掛程式的「位置」。參閱 .vinagre-plugin 檔" +"來取得特定的外掛程式的「位置」。" -#: ../data/vinagre.schemas.in.h:1 +#: ../data/vinagre.schemas.in.in.h:3 msgid "Maximum number of history items in connect dialog" msgstr "連線對話盒最歷史紀錄項目的最大數量" -#: ../data/vinagre.schemas.in.h:2 +#: ../data/vinagre.schemas.in.in.h:4 msgid "" "Set to \"false\" to disable menu shortcuts. Set to \"true\" to enable them. " "Note that if they are enabled, those keys will be intercepted by the menu " @@ -155,7 +152,7 @@ "設為「false」會停用選單捷徑鍵。設為「true」則會啟用它們。注意如果啟用它們，這" "些捷徑鍵會被選單攔截，而不會傳送至遠端主機。" -#: ../data/vinagre.schemas.in.h:3 +#: ../data/vinagre.schemas.in.in.h:5 msgid "" "Set to \"true\" to always show the tabs. Set to \"false\" to only show the " "tabs when there is more than one active connection." @@ -163,15 +160,15 @@ "設為「true」則永遠顯示分頁。設為「false」則只有在同時使用一個以上的連線時顯示" "分頁。" -#: ../data/vinagre.schemas.in.h:4 +#: ../data/vinagre.schemas.in.in.h:6 msgid "Specifies the maximum number of items in the host dropdown entry." msgstr "指定在主機下拉式項目中所顯示項目的最大數目。" -#: ../data/vinagre.schemas.in.h:5 +#: ../data/vinagre.schemas.in.in.h:7 msgid "The handler for \"vnc://\" URLs" msgstr "「vnc://」網址的處理程式" -#: ../data/vinagre.schemas.in.h:6 +#: ../data/vinagre.schemas.in.in.h:8 msgid "" "When connecting to a host, the client can say to the server to leave other " "clients connected or to drop the existent connections. Set the value to true " @@ -180,10 +177,19 @@ "當連線到主機時，此客戶端程式可以要求該伺服器保留其他已連線的客戶端或者中斷既" "存的連線。將這個數值設為 true 可以與其他客戶端程式共同使用桌面。" -#: ../data/vinagre.schemas.in.h:7 +#: ../data/vinagre.schemas.in.in.h:9 msgid "Whether we should leave other clients connected" msgstr "是否保留其他已連線的客戶端程式" +#: ../data/vinagre.schemas.in.in.h:10 +msgid "" +"Whether we should show tabs even when there is only one active connection" +msgstr "是否要在只使用一個連線時顯示分頁" + +#: ../data/vinagre.schemas.in.in.h:11 +msgid "Whether we should show the menu accelerators (shortcut keys)" +msgstr "是否顯示選單加速鍵（捷徑鍵）" + #: ../data/vinagre-mime.xml.in.h:1 msgid "Remote Desktop (VNC) file" msgstr "遠端桌面(VNC)文件" @@ -192,531 +198,752 @@ msgid "Remote Desktop Connection" msgstr "遠端桌面連線" -#: ../src/GNOME_VinagreApplet.server.in.in.h:1 +#. vim: set ts=8: +#: ../plugins/ssh/vinagre-ssh-plugin.c:70 +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1 +msgid "SSH" +msgstr "SSH" + +#. Translators: This is a description of the SSH protocol. It appears at Connect dialog. +#: ../plugins/ssh/vinagre-ssh-plugin.c:72 +msgid "Access Unix/Linux terminals" +msgstr "存取 Unix/Linux 終端機" + +#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135 +msgid "Port:" +msgstr "連接埠:" + +#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:2 +msgid "SSH support" +msgstr "SSH 支援" + +#: ../plugins/vnc/vinagre-vnc-connection.c:207 +#: ../plugins/vnc/vinagre-vnc-plugin.c:214 +#, c-format +msgid "" +"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." +msgstr "「shared」旗標數值錯誤：%d。它應該為 0 或 1。只能忽略此數值。" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:66 +msgid "Enable scaled mode" +msgstr "啟用縮放模式" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:81 +msgid "VNC Options:" +msgstr "VNC 選項：" + +#. Translators: this is a command line option (run vinagre --help) +#: ../plugins/vnc/vinagre-vnc-plugin.c:83 +msgid "Show VNC Options" +msgstr "顯示 VNC 選項" + +#. vim: set ts=8: +#: ../plugins/vnc/vinagre-vnc-plugin.c:105 +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1 +msgid "VNC" +msgstr "VNC" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:106 +msgid "Access Unix/Linux, Windows and other machines." +msgstr "存取 Unix/Linux、Windows 和其他電腦。" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:163 +msgid "Could not parse the file." +msgstr "無法解析該檔案。" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:170 +msgid "The file is not a VNC one: Missing the group \"connection\"." +msgstr "該檔案並非 VNC 檔案：缺少群組「connection」。" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:176 +msgid "The file is not a VNC one: Missing the key \"host\"." +msgstr "該檔案並非 VNC 檔案：缺少設定鍵「host」。" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:243 +msgid "VNC Options" +msgstr "VNC 選項" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:254 +#: ../plugins/vnc/vinagre-vnc-tab.c:654 +msgid "_View only" +msgstr "只有檢視(_V)" + +#: ../plugins/vnc/vinagre-vnc-plugin.c:261 +msgid "_Scaling" +msgstr "縮放(_S)" + +#. Translators: this is a pattern to open *.vnc files in a open dialog. +#: ../plugins/vnc/vinagre-vnc-plugin.c:285 +msgid "VNC Files" +msgstr "VNC 檔案" + +#: ../plugins/vnc/vinagre-vnc-tab.c:133 +msgid "Desktop Name:" +msgstr "桌面名稱：" + +#: ../plugins/vnc/vinagre-vnc-tab.c:136 +msgid "Dimensions:" +msgstr "尺寸:" + +#: ../plugins/vnc/vinagre-vnc-tab.c:268 +msgid "Error connecting to host." +msgstr "連線到主機時錯誤。" + +#. Translators: %s is a host name or IP address; %u is a code error (number). +#: ../plugins/vnc/vinagre-vnc-tab.c:306 +#, c-format +msgid "Authentication method to host %s is unsupported. (%u)" +msgstr "不支持到主機 %s 的驗證方法。(%u)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:310 +msgid "Authentication unsupported" +msgstr "不支援的驗證方法" + +#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587 +msgid "Authentication error" +msgstr "驗證錯誤" + +#: ../plugins/vnc/vinagre-vnc-tab.c:571 +msgid "A username is required in order to access this machine." +msgstr "為了存取這個電腦需要使用者名稱。" + +#: ../plugins/vnc/vinagre-vnc-tab.c:588 +msgid "A password is required in order to access this machine." +msgstr "為了存取這個電腦需要密碼。" + +#: ../plugins/vnc/vinagre-vnc-tab.c:639 +msgid "S_caling" +msgstr "縮放(_C)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:640 +msgid "Fits the remote screen into the current window size" +msgstr "讓遠端螢幕能符合目前的視窗大小" + +#: ../plugins/vnc/vinagre-vnc-tab.c:655 +msgid "Does not send mouse and keyboard events" +msgstr "不要送出滑鼠與鍵盤事件" + +#: ../plugins/vnc/vinagre-vnc-tab.c:668 +msgid "_Original size" +msgstr "原始大小(_O)" + +#: ../plugins/vnc/vinagre-vnc-tab.c:669 +msgid "Adjusts the window to the remote desktop's size" +msgstr "將視窗調整為遠端桌面的大小" + +#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766 +#: ../plugins/vnc/vinagre-vnc-tab.c:767 +msgid "Send Ctrl-Alt-Del" +msgstr "傳送 Ctrl-Alt-Del" + +#: ../plugins/vnc/vinagre-vnc-tab.c:693 +msgid "Sends Ctrl+Alt+Del to the remote machine" +msgstr "傳送 Ctrl+Alt+Del 到遠端機器" + +#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746 +msgid "Scaling" +msgstr "正在縮放" + +#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756 +msgid "Read only" +msgstr "唯讀" + +#: ../plugins/vnc/vinagre-vnc-tab.c:925 +msgid "" +"Scaling is not supported on this installation.\n" +"\n" +"Read the README file (shipped with Vinagre) in order to know how to enable " +"this feature." +msgstr "" +"縮放功能在這個安裝狀態下並不支援。\n" +"\n" +"請閱讀 README 檔案（隨附在 Vinagre 裡）以了解如何啟用這個功能。" + +#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2 +msgid "VNC support" +msgstr "VNC 支援" + +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1 msgid "A menu to quickly access remote machines" msgstr "用來快速連線到遠端機器的選單" -#: ../src/GNOME_VinagreApplet.server.in.in.h:3 +#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:3 msgid "Vinagre Applet Factory" msgstr " Vinagre 面板程式工廠" -#: ../src/vinagre-applet.c:271 ../src/vinagre-applet.c:349 +#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360 msgid "Could not run vinagre:" msgstr "無法執行 vinagre:" -#: ../src/vinagre-applet.c:369 +#: ../vinagre/vinagre-applet.c:380 msgid "Open Remote Desktop Viewer" msgstr "開啟遠端桌面檢視器" -#: ../src/vinagre-applet.c:419 +#: ../vinagre/vinagre-applet.c:435 msgid "Access your bookmarks" msgstr "存取您的書籤" -#: ../src/vinagre-bookmarks.c:344 +#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519 +#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256 +#, c-format +msgid "The protocol %s is not supported." +msgstr "未支援通訊協定 %s 。" + +#: ../vinagre/vinagre-bookmarks.c:343 #, c-format msgid "Error while initializing bookmarks: %s" msgstr "初始化書籤時錯誤：%s" -#: ../src/vinagre-bookmarks.c:344 ../src/vinagre-bookmarks.c:459 -#: ../src/vinagre-bookmarks-migration.c:133 ../src/vinagre-commands.c:145 -#: ../src/vinagre-connect.c:277 ../src/vinagre-fav.c:678 -#: ../src/vinagre-main.c:85 ../src/vinagre-main.c:104 -#: ../src/vinagre-window.c:279 +#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459 +#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100 +#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266 msgid "Unknown error" msgstr "不明的錯誤" -#: ../src/vinagre-bookmarks.c:351 +#: ../vinagre/vinagre-bookmarks.c:350 msgid "Error while initializing bookmarks: The file seems to be empty" msgstr "初始化書籤時發生錯誤：該檔案似乎是空的" -#: ../src/vinagre-bookmarks.c:358 +#: ../vinagre/vinagre-bookmarks.c:357 msgid "" "Error while initializing bookmarks: The file is not a vinagre bookmarks file" msgstr "初始化書籤時發生錯誤：該檔案並非 vinagre 書籤檔案" -#: ../src/vinagre-bookmarks.c:420 ../src/vinagre-bookmarks.c:427 +#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426 msgid "Error while saving bookmarks: Failed to create the XML structure" msgstr "儲存書籤時發生錯誤：建立 XML 結構失敗" -#: ../src/vinagre-bookmarks.c:434 ../src/vinagre-bookmarks.c:441 +#: ../vinagre/vinagre-bookmarks.c:433 ../vinagre/vinagre-bookmarks.c:440 msgid "Error while saving bookmarks: Failed to initialize the XML structure" msgstr "儲存書籤時發生錯誤：初始化 XML 結構失敗" -#: ../src/vinagre-bookmarks.c:450 +#: ../vinagre/vinagre-bookmarks.c:449 msgid "Error while saving bookmarks: Failed to finalize the XML structure" msgstr "儲存書籤時發生錯誤：結束 XML 結構失敗" -#: ../src/vinagre-bookmarks.c:459 +#: ../vinagre/vinagre-bookmarks.c:458 #, c-format msgid "Error while saving bookmarks: %s" msgstr "儲存書籤時錯誤：%s" -#: ../src/vinagre-bookmarks-migration.c:93 -#: ../src/vinagre-bookmarks-migration.c:100 +#: ../vinagre/vinagre-bookmarks-migration.c:95 +#: ../vinagre/vinagre-bookmarks-migration.c:102 msgid "Error while migrating bookmarks: Failed to create the XML structure" msgstr "在轉移書籤時發生錯誤：建立 XML 結構失敗" -#: ../src/vinagre-bookmarks-migration.c:107 -#: ../src/vinagre-bookmarks-migration.c:114 +#: ../vinagre/vinagre-bookmarks-migration.c:109 +#: ../vinagre/vinagre-bookmarks-migration.c:116 msgid "Error while migrating bookmarks: Failed to initialize the XML structure" msgstr "在轉移書籤時發生錯誤：初始化 XML 結構失敗" -#: ../src/vinagre-bookmarks-migration.c:123 +#: ../vinagre/vinagre-bookmarks-migration.c:125 msgid "Error while migrating bookmarks: Failed to finalize the XML structure" msgstr "在轉移書籤時發生錯誤：結束 XML 結構失敗" -#: ../src/vinagre-bookmarks-migration.c:133 -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:135 +#: ../vinagre/vinagre-bookmarks-migration.c:238 #, c-format msgid "Error while migrating bookmarks: %s" msgstr "轉移書籤時發生錯誤：%s" -#: ../src/vinagre-bookmarks-migration.c:231 +#: ../vinagre/vinagre-bookmarks-migration.c:164 +msgid "Error while migrating bookmarks: VNC plugin is not activated" +msgstr "轉移書籤時發生錯誤：尚未使用 VNC 外掛程式" + +#: ../vinagre/vinagre-bookmarks-migration.c:238 msgid "Failed to create the directory" msgstr "建立目錄失敗" -#: ../src/vinagre-bookmarks-migration.c:255 +#: ../vinagre/vinagre-bookmarks-migration.c:262 msgid "" "Migrating the bookmarks file to the new format. This operation is only " "supposed to run once." msgstr "正在將書籤檔案轉移為新的格式。這個操作只能執行一次。" -#: ../src/vinagre-bookmarks-migration.c:263 +#: ../vinagre/vinagre-bookmarks-migration.c:270 #, c-format msgid "Error opening old bookmarks file: %s" msgstr "開啟舊的書籤檔案時發生錯誤：%s" -#: ../src/vinagre-bookmarks-migration.c:264 -#: ../src/vinagre-bookmarks-migration.c:276 +#: ../vinagre/vinagre-bookmarks-migration.c:271 +#: ../vinagre/vinagre-bookmarks-migration.c:283 msgid "Migration cancelled" msgstr "轉移程序已取消" -#: ../src/vinagre-bookmarks-migration.c:273 +#: ../vinagre/vinagre-bookmarks-migration.c:280 msgid "Could not remove the old bookmarks file" msgstr "無法移除舊的書籤檔案" -#: ../src/vinagre-bookmarks-tree.c:120 +#: ../vinagre/vinagre-bookmarks-tree.c:120 msgid "Root Folder" msgstr "根資料夾" -#: ../src/vinagre-bookmarks-ui.c:66 +#: ../vinagre/vinagre-bookmarks-ui.c:78 msgid "Invalid name for this folder" msgstr "這個資料夾的名稱無效" -#: ../src/vinagre-bookmarks-ui.c:236 +#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200 +#, c-format +msgid "" +"The name \"%s\" is already used in this folder. Please use a different name." +msgstr "這個目錄內已經有名為「%s」的項目。請使用其他名稱。" + +#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190 +#: ../vinagre/vinagre-bookmarks-ui.c:201 +msgid "Invalid name for this item" +msgstr "這個項目的名稱無效" + +#. Translators: %s is a protocol name, like VNC or SSH +#: ../vinagre/vinagre-bookmarks-ui.c:168 #, c-format -msgid "Are you sure you want to remove %s from bookmarks?" -msgstr "您確認想從書籤中移除%s？" +msgid "(Protocol: %s)" +msgstr "(通訊協定：%s)" -#: ../src/vinagre-bookmarks-ui.c:241 +#. Translators: %s is a bookmark entry name +#: ../vinagre/vinagre-bookmarks-ui.c:308 +#, c-format +msgid "Are you sure you want to remove %s from bookmarks?" +msgstr "您確定想從書籤中移除 %s？" + +#: ../vinagre/vinagre-bookmarks-ui.c:314 msgid "Remove Folder?" msgstr "是否移除資料夾？" -#: ../src/vinagre-bookmarks-ui.c:242 +#: ../vinagre/vinagre-bookmarks-ui.c:315 msgid "Notice that all its subfolders and items will be removed as well." msgstr "注意它所有的子資料夾和項目也會被移除。" -#: ../src/vinagre-bookmarks-ui.c:247 +#: ../vinagre/vinagre-bookmarks-ui.c:320 msgid "Remove Item?" msgstr "是否移除項目？" -#: ../src/vinagre-bookmarks-ui.c:264 +#: ../vinagre/vinagre-bookmarks-ui.c:337 msgid "Error removing bookmark: Entry not found" msgstr "移除書籤時發生錯誤：找不到項目" -#: ../src/vinagre-bookmarks-ui.c:281 +#: ../vinagre/vinagre-bookmarks-ui.c:354 msgid "New Folder" msgstr "新增資料夾" -#: ../src/vinagre-commands.c:113 +#: ../vinagre/vinagre-commands.c:120 msgid "Choose the file" msgstr "選擇文件" -#: ../src/vinagre-commands.c:124 ../src/vinagre-tab.c:1152 -msgid "Supported formats" -msgstr "支援的格式" +#: ../vinagre/vinagre-commands.c:148 +msgid "There are none supported files" +msgstr "這裡沒有支援的檔案" -#: ../src/vinagre-commands.c:156 +#: ../vinagre/vinagre-commands.c:148 +msgid "" +"None of the active plugins offer a supported file to be open. Activate some " +"plugins and try again." +msgstr "" +"使用中的外掛程式沒有提供可開啟的支援檔案。請使用其他外掛程式後再試一次。" + +#: ../vinagre/vinagre-commands.c:181 msgid "The following file could not be opened:" msgid_plural "The following files could not be opened:" msgstr[0] "無法開啟下列文件：" msgstr[1] "無法開啟下列文件：" -#: ../src/vinagre-connect.c:181 +#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330 +#: ../vinagre/vinagre-connect.c:424 +msgid "Could not get the active protocol in the protocol list." +msgstr "無法在通訊協定清單中取得使用中的通訊協定。" + +#: ../vinagre/vinagre-connect.c:313 #, c-format msgid "Error while saving history file: %s" msgstr "儲存歷史紀錄檔案時發生錯誤：%s" -#: ../src/vinagre-connect.c:193 -msgid "Choose a VNC Server" -msgstr "選擇 VNC 伺服器" - -#: ../src/vinagre-connection.c:601 -#, c-format -msgid "The protocol %s is not supported." -msgstr "未支援通訊協定 %s 。" +#: ../vinagre/vinagre-connect.c:340 +msgid "Choose a Remote Desktop" +msgstr "選擇一個遠端桌面" -#: ../src/vinagre-connection.c:708 +#: ../vinagre/vinagre-connection.c:627 msgid "Could not open the file." msgstr "無法開啟該檔案。" -#: ../src/vinagre-connection.c:727 -msgid "Could not parse the file." -msgstr "無法解析該檔案。" - -#: ../src/vinagre-connection.c:772 -#, c-format -msgid "" -"Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it." -msgstr "「shared」旗標數值錯誤：%d。它應該為 0 或 1。只能忽略此數值。" +#: ../vinagre/vinagre-connection.c:651 +msgid "The file was not recognized by any of the plugins." +msgstr "該檔案無法被任何外掛程式辨識。" -#: ../src/vinagre-connection.c:778 -msgid "Could not find the host address in the file." -msgstr "在該檔案中找不到主機位址。" - -#: ../src/vinagre-fav.c:667 +#: ../vinagre/vinagre-fav.c:670 msgid "Invalid operation" msgstr "無效的操作" -#: ../src/vinagre-fav.c:668 +#: ../vinagre/vinagre-fav.c:671 msgid "Data received from drag&drop operation is invalid." msgstr "從拖放操作中取回的資料是無效的。" -#: ../src/vinagre-fav.c:861 +#: ../vinagre/vinagre-fav.c:871 msgid "Hosts nearby" msgstr "臨近的主機" -#: ../src/vinagre-main.c:53 -msgid "Opens a .vnc file" -msgstr "開啟 .vnc 文件" - -#: ../src/vinagre-main.c:53 -msgid "filename" -msgstr "檔案名稱" +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:62 +msgid "Open vinagre in fullscreen mode" +msgstr "以全螢幕模式開啟 vinagre" -#: ../src/vinagre-main.c:56 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:66 msgid "Create a new toplevel window in an existing instance of vinagre" msgstr "在既存的 vinagre 實體中建立新的頂層視窗" -#: ../src/vinagre-main.c:60 +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:70 +msgid "Open a file recognized by vinagre" +msgstr "開啟 vinagre 可辨識的檔案" + +#: ../vinagre/vinagre-main.c:70 +msgid "filename" +msgstr "檔案名稱" + +#. Translators: this is a command line option (run vinagre --help) +#: ../vinagre/vinagre-main.c:75 msgid "[server:port]" msgstr "[伺服器:埠口]" -#: ../src/vinagre-main.c:115 +#: ../vinagre/vinagre-main.c:130 msgid "The following error has occurred:" msgid_plural "The following errors have occurred:" msgstr[0] "發生下列錯誤：" msgstr[1] "發生下列錯誤：" #. Setup command line options -#: ../src/vinagre-main.c:137 -msgid "- VNC Client for GNOME" -msgstr "- GNOME 的 VNC 客戶端" +#: ../vinagre/vinagre-main.c:169 +msgid "- Remote Desktop Viewer" +msgstr "- 遠端桌面檢視器" -#: ../src/vinagre-main.c:146 +#: ../vinagre/vinagre-main.c:193 msgid "" "Run 'vinagre --help' to see a full list of available command line options" msgstr "執行「vinagre --help」以查看可用命令行選項的完整列表" -#: ../src/vinagre-mdns.c:123 +#: ../vinagre/vinagre-mdns.c:142 #, c-format msgid "Failed to resolve avahi hostname: %s\n" msgstr "解析 avahi 主機名稱失敗：%s\n" -#: ../src/vinagre-mdns.c:175 ../src/vinagre-mdns.c:184 +#: ../vinagre/vinagre-mdns.c:200 +#, c-format +msgid "Plugin %s has already registered a browser for service %s." +msgstr "外掛程式 %s 已被瀏覽器註冊用於服務 %s。" + +#: ../vinagre/vinagre-mdns.c:209 +#, c-format +msgid "Failed to add mDNS browser for service %s." +msgstr "將 mDNS 瀏覽器加入服務 %s失敗。" + +#: ../vinagre/vinagre-mdns.c:225 #, c-format msgid "Failed to browse for hosts: %s\n" msgstr "瀏覽主機失敗：%s\n" -#: ../src/vinagre-notebook.c:168 +#: ../vinagre/vinagre-mdns.c:298 #, c-format -msgid "Connection to host %s was closed." -msgstr "到主機 %s 的連線已關閉。" +msgid "Failed to initialize mDNS browser: %s\n" +msgstr "初始化 mDNS 瀏覽器失敗：%s\n" -#: ../src/vinagre-notebook.c:170 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:461 +#, c-format +msgid "Connection to host %s was closed." +msgstr "到主機 %s 的連線已關閉。" + +#: ../vinagre/vinagre-notebook.c:463 msgid "Connection closed" msgstr "連線已關閉" -#: ../src/vinagre-notebook.c:194 +#. Translators: %s is a host name or IP address. +#: ../vinagre/vinagre-notebook.c:482 +#, c-format +msgid "Authentication to host %s has failed" +msgstr "到主機 %s 的驗證失敗" + +#: ../vinagre/vinagre-notebook.c:488 +msgid "Authentication failed" +msgstr "驗證失敗" + +#: ../vinagre/vinagre-notebook.c:525 msgid "Connecting..." msgstr "正在連線..." -#: ../src/vinagre-notebook.c:221 ../src/vinagre-tab.c:878 +#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325 msgid "Close connection" msgstr "關閉連線" -#: ../src/vinagre-prefs.c:169 +#: ../vinagre/vinagre-plugin-dialog.c:83 +msgid "Plugin Manager" +msgstr "外掛程式管理員" + +#: ../vinagre/vinagre-plugin-manager.c:45 +msgid "Plugin" +msgstr "外掛程式" + +#: ../vinagre/vinagre-plugin-manager.c:46 +msgid "Enabled" +msgstr "已啟用" + +#: ../vinagre/vinagre-plugin-manager.c:503 +msgid "C_onfigure" +msgstr "設定(_O)" + +#: ../vinagre/vinagre-plugin-manager.c:512 +msgid "A_ctivate" +msgstr "使用(_C)" + +#: ../vinagre/vinagre-plugin-manager.c:523 +msgid "Ac_tivate All" +msgstr "使用全部(_T)" + +#: ../vinagre/vinagre-plugin-manager.c:528 +msgid "_Deactivate All" +msgstr "全部不使用(_D)" + +#: ../vinagre/vinagre-plugin-manager.c:824 +msgid "_About Plugin" +msgstr "關於外掛程式(_A)" + +#: ../vinagre/vinagre-plugin-manager.c:828 +msgid "C_onfigure Plugin" +msgstr "設定外掛程式(_O)" + +#: ../vinagre/vinagre-prefs.c:217 msgid "Cannot initialize preferences manager." msgstr "無法初始化偏好設定管理員。" -#: ../src/vinagre-tab.c:322 -msgid "Error connecting to host." -msgstr "連線到主機時錯誤。" - -#: ../src/vinagre-tab.c:354 -#, c-format -msgid "Authentication to host %s has failed" -msgstr "到主機 %s 的驗證失敗" +#: ../vinagre/vinagre-tab.c:346 +msgid "Leave fullscreen" +msgstr "離開全螢幕" -#: ../src/vinagre-tab.c:360 -msgid "Authentication failed" -msgstr "驗證失敗" - -#: ../src/vinagre-tab.c:382 -#, c-format -msgid "Authentication method to host %s is unsupported. (%u)" -msgstr "不支持到主機 %s 的驗證方法。(%u)" - -#: ../src/vinagre-tab.c:386 -msgid "Authentication unsupported" -msgstr "不支援的驗證方法" - -#: ../src/vinagre-tab.c:460 +#: ../vinagre/vinagre-tab.c:495 msgid "Error saving recent connection." msgstr "儲存最近連線時錯誤。" -#: ../src/vinagre-tab.c:492 -msgid "Error saving the credential on the keyring." +#: ../vinagre/vinagre-tab.c:728 +msgid "Error saving the credentials on the keyring." msgstr "儲存憑證到鑰匙圈時發生錯誤。" -#: ../src/vinagre-tab.c:747 ../src/vinagre-tab.c:764 -msgid "Authentication error" -msgstr "驗證錯誤" - -#: ../src/vinagre-tab.c:748 -msgid "A username is required in order to access this machine." -msgstr "為了存取這個電腦需要使用者名稱。" +#: ../vinagre/vinagre-tab.c:814 +msgid "Could not get a screenshot of the connection." +msgstr "無法取得此連線的畫面快照。" -#: ../src/vinagre-tab.c:765 -msgid "A password is required in order to access this machine." -msgstr "為了存取這個電腦需要密碼。" +#: ../vinagre/vinagre-tab.c:819 +msgid "Save Screenshot" +msgstr "儲存畫面快照" -#: ../src/vinagre-tab.c:891 -msgid "Minimize window" -msgstr "最小化視窗" +#: ../vinagre/vinagre-tab.c:830 +#, c-format +msgid "Screenshot of %s" +msgstr "%s 的畫面快照" -#: ../src/vinagre-tab.c:906 ../src/vinagre-tab.c:907 -msgid "Scaling" -msgstr "正在縮放" +#: ../vinagre/vinagre-tab.c:881 +msgid "Error saving screenshot" +msgstr "儲存畫面快照時發生錯誤" -#: ../src/vinagre-tab.c:916 ../src/vinagre-tab.c:917 -msgid "Read only" -msgstr "唯讀" +#: ../vinagre/vinagre-tube-handler.c:232 +#, c-format +msgid "Impossible to get service property: %s" +msgstr "不可能取得服務屬性：%s" -#. Machine menu -#: ../src/vinagre-tab.c:927 ../src/vinagre-tab.c:928 ../src/vinagre-ui.h:85 -msgid "Take screenshot" -msgstr "擷取畫面快照" +#: ../vinagre/vinagre-tube-handler.c:289 +#, c-format +msgid "Impossible to create the connection: %s" +msgstr "不可能建立連線：%s" -#: ../src/vinagre-tab.c:936 ../src/vinagre-tab.c:937 ../src/vinagre-ui.h:88 -msgid "Send Ctrl-Alt-Del" -msgstr "傳送 Ctrl-Alt-Del" +#: ../vinagre/vinagre-tube-handler.c:328 +#, c-format +msgid "Impossible to accept the stream tube: %s" +msgstr "不可能接受串流管：%s" -#: ../src/vinagre-tab.c:1061 -msgid "Desktop Name:" -msgstr "桌面名稱：" +#: ../vinagre/vinagre-tube-handler.c:404 +#, c-format +msgid "Failed to request name: %s" +msgstr "要求名稱失敗：%s" -#: ../src/vinagre-tab.c:1063 -msgid "Port:" -msgstr "連接埠:" +#: ../vinagre/vinagre-tube-handler.c:405 +msgid "No error given" +msgstr "沒有指定的錯誤" -#: ../src/vinagre-tab.c:1064 -msgid "Dimensions:" -msgstr "尺寸:" +#: ../vinagre/vinagre-tube-handler.c:482 +#, c-format +msgid "Impossible to get the contact name: %s" +msgstr "不可能取得連絡人名稱：%s" -#: ../src/vinagre-tab.c:1130 -msgid "Could not get a screenshot of the connection." -msgstr "無法取得此連線的畫面快照。" +#: ../vinagre/vinagre-tube-handler.c:517 +#, c-format +msgid "Impossible to get the avatar: %s" +msgstr "不可能取得大頭貼：%s" -#: ../src/vinagre-tab.c:1138 +#: ../vinagre/vinagre-tube-handler.c:538 #, c-format -msgid "Screenshot of %s" -msgstr "%s 的畫面快照" +msgid "%s wants to share his desktop with you." +msgstr "%s 想要與您分享他的桌面。" -#: ../src/vinagre-tab.c:1141 -msgid "Save Screenshot" -msgstr "儲存畫面快照" - -#: ../src/vinagre-tab.c:1205 -msgid "" -"Scaling is not supported on this installation.\n" -"\n" -"Read the README file (shipped with Vinagre) in order to know how to enable " -"this feature." -msgstr "" -"縮放功能在這個安裝狀態下並不支援。\n" -"\n" -"請閱讀 README 檔案（隨附在 Vinagre 裡）以了解如何啟用這個功能。" +#: ../vinagre/vinagre-tube-handler.c:543 +msgid "Desktop sharing invitation" +msgstr "桌面共享邀請" #. Toplevel -#: ../src/vinagre-ui.h:33 +#: ../vinagre/vinagre-ui.h:33 msgid "_Machine" msgstr "機器(_M)" -#: ../src/vinagre-ui.h:34 +#: ../vinagre/vinagre-ui.h:34 msgid "_Edit" msgstr "編輯(_E)" -#: ../src/vinagre-ui.h:35 +#: ../vinagre/vinagre-ui.h:35 msgid "_View" msgstr "檢視(_V)" -#: ../src/vinagre-ui.h:36 +#: ../vinagre/vinagre-ui.h:36 msgid "_Bookmarks" msgstr "書籤(_B)" -#: ../src/vinagre-ui.h:41 +#: ../vinagre/vinagre-ui.h:41 msgid "Connect to a remote machine" msgstr "連線到遠端機器" -#: ../src/vinagre-ui.h:43 +#: ../vinagre/vinagre-ui.h:43 msgid "Open a .VNC file" msgstr "開啟 .VNC 文件" -#: ../src/vinagre-ui.h:45 +#: ../vinagre/vinagre-ui.h:45 msgid "Quit the program" msgstr "結束程式" -#: ../src/vinagre-ui.h:49 +#: ../vinagre/vinagre-ui.h:49 msgid "Edit the application preferences" msgstr "編輯應用程式偏好設定" +#. FIXME: Study this dialog for next release +#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, +#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, +#. #. Bookmarks menu -#: ../src/vinagre-ui.h:52 +#: ../vinagre/vinagre-ui.h:56 msgid "_Open bookmark" msgstr "開啟書籤(_O)" -#: ../src/vinagre-ui.h:53 +#: ../vinagre/vinagre-ui.h:57 msgid "Connect to this machine" msgstr "連線到此機器" -#: ../src/vinagre-ui.h:54 +#: ../vinagre/vinagre-ui.h:58 msgid "_Edit bookmark" msgstr "編輯書籤(_E)" -#: ../src/vinagre-ui.h:55 +#: ../vinagre/vinagre-ui.h:59 msgid "Edit the details of selected bookmark" msgstr "編輯所選擇書籤的細節" -#: ../src/vinagre-ui.h:56 +#: ../vinagre/vinagre-ui.h:60 msgid "_Remove from bookmarks" msgstr "從書籤中移除(_R)" -#: ../src/vinagre-ui.h:57 +#: ../vinagre/vinagre-ui.h:61 msgid "Remove current selected connection from bookmarks" msgstr "從書籤中移除當前選擇的連線" -#: ../src/vinagre-ui.h:58 +#: ../vinagre/vinagre-ui.h:62 msgid "_New Folder" msgstr "新增資料夾(_N)" -#: ../src/vinagre-ui.h:59 +#: ../vinagre/vinagre-ui.h:63 msgid "Create a new folder" msgstr "建立新的資料夾" #. Help menu -#: ../src/vinagre-ui.h:62 +#: ../vinagre/vinagre-ui.h:66 msgid "_Contents" msgstr "內容(_C)" -#: ../src/vinagre-ui.h:63 +#: ../vinagre/vinagre-ui.h:67 msgid "Open the vinagre manual" msgstr "開啟 vinagre 手冊" -#: ../src/vinagre-ui.h:65 +#: ../vinagre/vinagre-ui.h:69 msgid "About this application" msgstr "關於此程式" -#: ../src/vinagre-ui.h:72 +#: ../vinagre/vinagre-ui.h:74 +msgid "_Toolbar" +msgstr "工具列(_T)" + +#: ../vinagre/vinagre-ui.h:75 +msgid "Show or hide the toolbar" +msgstr "顯示或隱藏工具列" + +#: ../vinagre/vinagre-ui.h:78 +msgid "_Statusbar" +msgstr "狀態列(_S)" + +#: ../vinagre/vinagre-ui.h:79 +msgid "Show or hide the statusbar" +msgstr "顯示或隱藏狀態列" + +#: ../vinagre/vinagre-ui.h:82 +msgid "Side _Panel" +msgstr "側邊面板(_P)" + +#: ../vinagre/vinagre-ui.h:83 +msgid "Show or hide the side panel" +msgstr "顯示或隱藏側邊面板" + +#: ../vinagre/vinagre-ui.h:91 msgid "Close the current connection" msgstr "關閉當前連線" -#: ../src/vinagre-ui.h:73 +#: ../vinagre/vinagre-ui.h:92 msgid "C_lose All" msgstr "全部關閉(_L)" -#: ../src/vinagre-ui.h:74 +#: ../vinagre/vinagre-ui.h:93 msgid "Close all active connections" msgstr "關閉全部活動中的連線" #. Bookmarks menu -#: ../src/vinagre-ui.h:77 +#: ../vinagre/vinagre-ui.h:96 msgid "_Add to bookmarks" msgstr "新增至書籤(_A)" -#: ../src/vinagre-ui.h:78 +#: ../vinagre/vinagre-ui.h:97 msgid "Add current connection to your bookmarks" msgstr "新增目前連線至您的書籤" -#: ../src/vinagre-ui.h:86 +#. Machine menu +#: ../vinagre/vinagre-ui.h:104 +msgid "Take screenshot" +msgstr "擷取畫面快照" + +#: ../vinagre/vinagre-ui.h:105 msgid "Take a screenshot of active connection" msgstr "擷取活動連線的畫面快照" -#: ../src/vinagre-ui.h:89 -msgid "Send Ctrl+Alt+Del to active connection" -msgstr "傳送 Ctrl+Alt+Del 到活動中的連線" - -#: ../src/vinagre-ui.h:93 +#: ../vinagre/vinagre-ui.h:109 msgid "View the current machine in full screen" msgstr "以全螢幕檢視當前機器" -#: ../src/vinagre-ui.h:95 -msgid "_Original size" -msgstr "原始大小(_O)" - -#: ../src/vinagre-ui.h:96 -msgid "Adjusts the window to the remote desktop's size" -msgstr "將視窗調整為遠端桌面的大小" - -#: ../src/vinagre-ui.h:102 -msgid "S_caling" -msgstr "縮放(_C)" - -#: ../src/vinagre-ui.h:103 -msgid "Fit the remote screen into the current window size" -msgstr "讓遠端螢幕能符合目前的視窗大小" - -#: ../src/vinagre-ui.h:105 -msgid "_Read only" -msgstr "唯讀(_R)" - -#: ../src/vinagre-ui.h:106 -msgid "Disable mouse and keyboard" -msgstr "停用滑鼠與鍵盤" - -#: ../src/vinagre-ui.h:112 -msgid "_Toolbar" -msgstr "工具列(_T)" - -#: ../src/vinagre-ui.h:113 -msgid "Show or hide the toolbar" -msgstr "顯示或隱藏工具列" - -#: ../src/vinagre-ui.h:116 -msgid "_Statusbar" -msgstr "狀態列(_S)" - -#: ../src/vinagre-ui.h:117 -msgid "Show or hide the statusbar" -msgstr "顯示或隱藏狀態列" - -#: ../src/vinagre-ui.h:120 -msgid "Side _Panel" -msgstr "側邊面板(_P)" - -#: ../src/vinagre-ui.h:121 -msgid "Show or hide the side panel" -msgstr "顯示或隱藏側邊面板" - -#: ../src/vinagre-utils.c:75 +#: ../vinagre/vinagre-utils.c:75 msgid "An error has occurred:" msgstr "發生錯誤：" -#: ../src/vinagre-utils.c:433 -msgid "Vinagre is a VNC client for the GNOME Desktop" -msgstr "Vinagre 是 GNOME 桌面的 VNC 客戶端" +#: ../vinagre/vinagre-utils.c:150 +#, c-format +msgid "Could not load builder file: %s" +msgstr "無法載入建置檔案：%s" -#: ../src/vinagre-utils.c:436 +#: ../vinagre/vinagre-utils.c:453 +msgid "Vinagre is a remote desktop viewer for the GNOME Desktop" +msgstr "Vinagre 是 GNOME 桌面的遠端桌面檢視器" + +#: ../vinagre/vinagre-utils.c:456 msgid "" "Vinagre 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 " @@ -726,7 +953,7 @@ "Vinagre 是自由軟體；您可以在自由軟體基金會發行的 GNU 通用公共許可的條款下重新" "分發它和/或修改它；無論此許可的版本2，或者(以您的選擇)任何更新的版本。" -#: ../src/vinagre-utils.c:440 +#: ../vinagre/vinagre-utils.c:460 msgid "" "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -736,7 +963,7 @@ "Vinagre 被發佈是希望它能夠有所用處，但「沒有任何保證」；甚至沒有隱含「可銷" "售」或者「用於特定用途」的保證。請查看 GNU 通用公共許可以獲得更多細節。" -#: ../src/vinagre-utils.c:444 +#: ../vinagre/vinagre-utils.c:464 msgid "" "You should have received a copy of the GNU General Public License along with " "this program. If not, see ." @@ -744,7 +971,7 @@ "您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，請參訪 " "。" -#: ../src/vinagre-utils.c:466 +#: ../vinagre/vinagre-utils.c:486 msgid "translator-credits" msgstr "" "GNOME 程式中文化郵件論壇\n" @@ -752,28 +979,63 @@ "\n" "Hialan Liu , 2008" -#: ../src/vinagre-utils.c:469 +#: ../vinagre/vinagre-utils.c:489 msgid "Vinagre Website" msgstr "Vinagre 網站" -#: ../src/vinagre-window.c:413 +#: ../vinagre/vinagre-window.c:397 #, c-format msgid "Could not merge vinagre-ui.xml: %s" msgstr "無法合併 vinagre-ui.xml：%s" -#: ../src/vinagre-window.c:441 +#: ../vinagre/vinagre-window.c:425 msgid "_Recent connections" msgstr "最近連線(_R)" #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu -#: ../src/vinagre-window.c:614 +#: ../vinagre/vinagre-window.c:585 #, c-format msgid "Open %s:%d" msgstr "開啟 %s：%d" -#: ../src/vinagre-window.c:797 -msgid "Press Ctrl+Alt to release the cursor" -msgstr "按 Ctrl+Alt 以釋放游標" +#~ msgid "Minimize window" +#~ msgstr "最小化視窗" + +#~ msgid "_Plugins" +#~ msgstr "外掛程式(_P)" + +#~ msgid "Select plugins" +#~ msgstr "選擇外掛程式" + +#~ msgid "Supported formats" +#~ msgstr "支援的格式" + +#~ msgid "Connection" +#~ msgstr "連線" + +#~ msgid "Folder" +#~ msgstr "資料夾" + +#~ msgid "host or host:display or host::port" +#~ msgstr "主機 或 主機:畫面 或 主機::連接埠" + +#~ msgid "Choose a VNC Server" +#~ msgstr "選擇 VNC 伺服器" + +#~ msgid "Could not find the host address in the file." +#~ msgstr "在該檔案中找不到主機位址。" + +#~ msgid "Opens a .vnc file" +#~ msgstr "開啟 .vnc 文件" + +#~ msgid "- VNC Client for GNOME" +#~ msgstr "- GNOME 的 VNC 客戶端" + +#~ msgid "_Read only" +#~ msgstr "唯讀(_R)" + +#~ msgid "Press Ctrl+Alt to release the cursor" +#~ msgstr "按 Ctrl+Alt 以釋放游標" #~ msgid "Editing a bookmark" #~ msgstr "編輯書籤" @@ -809,9 +1071,6 @@ #~ "effects and try again." #~ msgstr "縮放功能在組合式視窗中無法正確運作。請停用視覺效果後再試一次。" -#~ msgid "_Port:" -#~ msgstr "連接埠(_P):" - #~ msgid "Image" #~ msgstr "圖片" diff -Nru vinagre-2.26.1/README vinagre-2.29.1/README --- vinagre-2.26.1/README 2009-04-13 14:32:17.000000000 +0100 +++ vinagre-2.29.1/README 2009-10-26 13:23:30.000000000 +0000 @@ -1,7 +1,7 @@ -Vinagre 2.26.1 +Vinagre 2.29.1 ============== -This is vinagre, a VNC client for the GNOME Desktop. +This is vinagre, a remote desktop viewer for the GNOME Desktop. You can download or see more information about it on: http://projects.gnome.org/vinagre/ diff -Nru vinagre-2.26.1/src/bacon-message-connection.c vinagre-2.29.1/src/bacon-message-connection.c --- vinagre-2.26.1/src/bacon-message-connection.c 2008-05-09 21:00:09.000000000 +0100 +++ vinagre-2.29.1/src/bacon-message-connection.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,396 +0,0 @@ -/* - * Copyright (C) 2003 Bastien Nocera - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "bacon-message-connection.h" - -#ifndef UNIX_PATH_MAX -#define UNIX_PATH_MAX 108 -#endif - -struct BaconMessageConnection { - /* A server accepts connections */ - gboolean is_server; - - /* The socket path itself */ - char *path; - - /* File descriptor of the socket */ - int fd; - /* Channel to watch */ - GIOChannel *chan; - /* Event id returned by g_io_add_watch() */ - int conn_id; - - /* Connections accepted by this connection */ - GSList *accepted_connections; - - /* callback */ - void (*func) (const char *message, gpointer user_data); - gpointer data; -}; - -static gboolean -test_is_socket (const char *path) -{ - struct stat s; - - if (stat (path, &s) == -1) - return FALSE; - - if (S_ISSOCK (s.st_mode)) - return TRUE; - - return FALSE; -} - -static gboolean -is_owned_by_user_and_socket (const char *path) -{ - struct stat s; - - if (stat (path, &s) == -1) - return FALSE; - - if (s.st_uid != geteuid ()) - return FALSE; - - if ((s.st_mode & S_IFSOCK) != S_IFSOCK) - return FALSE; - - return TRUE; -} - -static gboolean server_cb (GIOChannel *source, - GIOCondition condition, gpointer data); - -static gboolean -setup_connection (BaconMessageConnection *conn) -{ - g_return_val_if_fail (conn->chan == NULL, FALSE); - - conn->chan = g_io_channel_unix_new (conn->fd); - if (!conn->chan) { - return FALSE; - } - g_io_channel_set_line_term (conn->chan, "\n", 1); - conn->conn_id = g_io_add_watch (conn->chan, G_IO_IN, server_cb, conn); - - return TRUE; -} - -static void -accept_new_connection (BaconMessageConnection *server_conn) -{ - BaconMessageConnection *conn; - int alen; - - g_return_if_fail (server_conn->is_server); - - conn = g_new0 (BaconMessageConnection, 1); - conn->is_server = FALSE; - conn->func = server_conn->func; - conn->data = server_conn->data; - - conn->fd = accept (server_conn->fd, NULL, (guint *)&alen); - - server_conn->accepted_connections = - g_slist_prepend (server_conn->accepted_connections, conn); - - setup_connection (conn); -} - -static gboolean -server_cb (GIOChannel *source, GIOCondition condition, gpointer data) -{ - BaconMessageConnection *conn = (BaconMessageConnection *)data; - char *message, *subs, buf; - int cd, rc, offset; - gboolean finished; - - offset = 0; - if (conn->is_server && conn->fd == g_io_channel_unix_get_fd (source)) { - accept_new_connection (conn); - return TRUE; - } - message = g_malloc (1); - cd = conn->fd; - rc = read (cd, &buf, 1); - while (rc > 0 && buf != '\n') - { - message = g_realloc (message, rc + offset + 1); - message[offset] = buf; - offset = offset + rc; - rc = read (cd, &buf, 1); - } - if (rc <= 0) { - g_io_channel_shutdown (conn->chan, FALSE, NULL); - g_io_channel_unref (conn->chan); - conn->chan = NULL; - close (conn->fd); - conn->fd = -1; - g_free (message); - conn->conn_id = 0; - - return FALSE; - } - message[offset] = '\0'; - - subs = message; - finished = FALSE; - - while (finished == FALSE && *subs != '\0') - { - if (conn->func != NULL) - (*conn->func) (subs, conn->data); - - subs += strlen (subs) + 1; - if (subs - message >= offset) - finished = TRUE; - } - - g_free (message); - - return TRUE; -} - -static char * -find_file_with_pattern (const char *dir, const char *pattern) -{ - GDir *filedir; - char *found_filename; - const char *filename; - GPatternSpec *pat; - - filedir = g_dir_open (dir, 0, NULL); - if (filedir == NULL) - return NULL; - - pat = g_pattern_spec_new (pattern); - if (pat == NULL) - { - g_dir_close (filedir); - return NULL; - } - - found_filename = NULL; - - while ((filename = g_dir_read_name (filedir))) - { - if (g_pattern_match_string (pat, filename)) - { - char *tmp = g_build_filename (dir, filename, NULL); - if (is_owned_by_user_and_socket (tmp)) - found_filename = g_strdup (filename); - g_free (tmp); - } - - if (found_filename != NULL) - break; - } - - g_pattern_spec_free (pat); - g_dir_close (filedir); - - return found_filename; -} - -static char * -socket_filename (const char *prefix) -{ - char *pattern, *newfile, *path, *filename; - const char *tmpdir; - - pattern = g_strdup_printf ("%s.%s.*", prefix, g_get_user_name ()); - tmpdir = g_get_tmp_dir (); - filename = find_file_with_pattern (tmpdir, pattern); - if (filename == NULL) - { - newfile = g_strdup_printf ("%s.%s.%u", prefix, - g_get_user_name (), g_random_int ()); - path = g_build_filename (tmpdir, newfile, NULL); - g_free (newfile); - } else { - path = g_build_filename (tmpdir, filename, NULL); - g_free (filename); - } - - g_free (pattern); - return path; -} - -static gboolean -try_server (BaconMessageConnection *conn) -{ - struct sockaddr_un uaddr; - - uaddr.sun_family = AF_UNIX; - strncpy (uaddr.sun_path, conn->path, - MIN (strlen(conn->path)+1, UNIX_PATH_MAX)); - conn->fd = socket (PF_UNIX, SOCK_STREAM, 0); - if (bind (conn->fd, (struct sockaddr *) &uaddr, sizeof (uaddr)) == -1) - { - conn->fd = -1; - return FALSE; - } - listen (conn->fd, 5); - - if (!setup_connection (conn)) - return FALSE; - return TRUE; -} - -static gboolean -try_client (BaconMessageConnection *conn) -{ - struct sockaddr_un uaddr; - - uaddr.sun_family = AF_UNIX; - strncpy (uaddr.sun_path, conn->path, - MIN(strlen(conn->path)+1, UNIX_PATH_MAX)); - conn->fd = socket (PF_UNIX, SOCK_STREAM, 0); - if (connect (conn->fd, (struct sockaddr *) &uaddr, - sizeof (uaddr)) == -1) - { - conn->fd = -1; - return FALSE; - } - - return setup_connection (conn); -} - -BaconMessageConnection * -bacon_message_connection_new (const char *prefix) -{ - BaconMessageConnection *conn; - - g_return_val_if_fail (prefix != NULL, NULL); - - conn = g_new0 (BaconMessageConnection, 1); - conn->path = socket_filename (prefix); - - if (test_is_socket (conn->path) == FALSE) - { - if (!try_server (conn)) - { - bacon_message_connection_free (conn); - return NULL; - } - - conn->is_server = TRUE; - return conn; - } - - if (try_client (conn) == FALSE) - { - unlink (conn->path); - try_server (conn); - if (conn->fd == -1) - { - bacon_message_connection_free (conn); - return NULL; - } - - conn->is_server = TRUE; - return conn; - } - - conn->is_server = FALSE; - return conn; -} - -void -bacon_message_connection_free (BaconMessageConnection *conn) -{ - GSList *child_conn; - - g_return_if_fail (conn != NULL); - /* Only servers can accept other connections */ - g_return_if_fail (conn->is_server != FALSE || - conn->accepted_connections == NULL); - - child_conn = conn->accepted_connections; - while (child_conn != NULL) { - bacon_message_connection_free (child_conn->data); - child_conn = g_slist_next (child_conn); - } - g_slist_free (conn->accepted_connections); - - if (conn->conn_id) { - g_source_remove (conn->conn_id); - conn->conn_id = 0; - } - if (conn->chan) { - g_io_channel_shutdown (conn->chan, FALSE, NULL); - g_io_channel_unref (conn->chan); - } - - if (conn->is_server != FALSE) { - unlink (conn->path); - } - if (conn->fd != -1) { - close (conn->fd); - } - - g_free (conn->path); - g_free (conn); -} - -void -bacon_message_connection_set_callback (BaconMessageConnection *conn, - BaconMessageReceivedFunc func, - gpointer user_data) -{ - g_return_if_fail (conn != NULL); - - conn->func = func; - conn->data = user_data; -} - -void -bacon_message_connection_send (BaconMessageConnection *conn, - const char *message) -{ - g_return_if_fail (conn != NULL); - g_return_if_fail (message != NULL); - - g_io_channel_write_chars (conn->chan, message, strlen (message), - NULL, NULL); - g_io_channel_write_chars (conn->chan, "\n", 1, NULL, NULL); - g_io_channel_flush (conn->chan, NULL); -} - -gboolean -bacon_message_connection_get_is_server (BaconMessageConnection *conn) -{ - g_return_val_if_fail (conn != NULL, FALSE); - - return conn->is_server; -} - diff -Nru vinagre-2.26.1/src/bacon-message-connection.h vinagre-2.29.1/src/bacon-message-connection.h --- vinagre-2.26.1/src/bacon-message-connection.h 2008-05-09 21:00:09.000000000 +0100 +++ vinagre-2.29.1/src/bacon-message-connection.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2003 Bastien Nocera - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef BACON_MESSAGE_CONNECTION_H -#define BACON_MESSAGE_CONNECTION_H - -#include - -G_BEGIN_DECLS - -typedef void (*BaconMessageReceivedFunc) (const char *message, - gpointer user_data); - -typedef struct BaconMessageConnection BaconMessageConnection; - -BaconMessageConnection *bacon_message_connection_new (const char *prefix); -void bacon_message_connection_free (BaconMessageConnection *conn); -void bacon_message_connection_set_callback (BaconMessageConnection *conn, - BaconMessageReceivedFunc func, - gpointer user_data); -void bacon_message_connection_send (BaconMessageConnection *conn, - const char *message); -gboolean bacon_message_connection_get_is_server (BaconMessageConnection *conn); - -G_END_DECLS - -#endif /* BACON_MESSAGE_CONNECTION_H */ diff -Nru vinagre-2.26.1/src/GNOME_VinagreApplet.server.in.in vinagre-2.29.1/src/GNOME_VinagreApplet.server.in.in --- vinagre-2.26.1/src/GNOME_VinagreApplet.server.in.in 2008-06-13 15:22:44.000000000 +0100 +++ vinagre-2.29.1/src/GNOME_VinagreApplet.server.in.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru vinagre-2.26.1/src/Makefile.am vinagre-2.29.1/src/Makefile.am --- vinagre-2.26.1/src/Makefile.am 2008-12-11 14:36:25.000000000 +0000 +++ vinagre-2.29.1/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,158 +0,0 @@ -SUBDIRS = view - -NULL = - -############################## -# The main binary -############################## - -INCLUDES = \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DVINAGRE_DATADIR=\""$(datadir)/vinagre"\" \ - -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ - $(VINAGRE_CFLAGS) \ - $(AVAHI_CFLAGS) \ - $(NULL) - -bin_PROGRAMS = vinagre - -vinagre_SOURCES = \ - vinagre-commands.c vinagre-commands.h \ - vinagre-connect.c vinagre-connect.h \ - vinagre-connection.c vinagre-connection.h \ - vinagre-fav.c vinagre-fav.h \ - vinagre-bookmarks.c vinagre-bookmarks.h \ - vinagre-main.c \ - vinagre-notebook.c vinagre-notebook.h \ - vinagre-tab.c vinagre-tab.h \ - vinagre-utils.c vinagre-utils.h \ - vinagre-window.c vinagre-window.h \ - vinagre-ui.h vinagre-window-private.h \ - vinagre-enums.h vinagre-enums.c \ - vinagre-prefs.h vinagre-prefs.c \ - bacon-message-connection.h bacon-message-connection.c \ - vinagre-app.h vinagre-app.c \ - vinagre-bacon.h vinagre-bacon.c \ - vinagre-bookmarks-entry.h vinagre-bookmarks-entry.c \ - vinagre-bookmarks-tree.h vinagre-bookmarks-tree.c \ - vinagre-bookmarks-ui.h vinagre-bookmarks-ui.c \ - vinagre-bookmarks-migration.h vinagre-bookmarks-migration.c \ - $(NULL) - -if AVAHI -vinagre_SOURCES += vinagre-mdns.h vinagre-mdns.c -endif - -vinagre_LDADD = \ - $(VINAGRE_LIBS) \ - $(AVAHI_LIBS) \ - $(GTKVNC_LIBS) \ - view/libview.la \ - $(NULL) - -############################## -# Bonobo .server -############################## - -serverdir = \ - $(libdir)/bonobo/servers -server_in_files = \ - GNOME_VinagreApplet.server.in -server_DATA = \ - $(server_in_files:.server.in=.server) - -$(server_in_files): $(server_in_files:.server.in=.server.in.in) - sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ - -@INTLTOOL_SERVER_RULE@ - -############################## -# The applet binary -############################## - -libexec_PROGRAMS = vinagre-applet - -vinagre_applet_CFLAGS = \ - $(APPLET_CFLAGS) \ - $(AVAHI_CFLAGS) \ - $(NULL) - -vinagre_applet_SOURCES = \ - vinagre-applet.c \ - vinagre-bookmarks.h vinagre-bookmarks.c \ - vinagre-connection.h vinagre-connection.c \ - vinagre-utils.h vinagre-utils.c \ - vinagre-enums.h vinagre-enums.c \ - vinagre-bookmarks-entry.h vinagre-bookmarks-entry.c \ - vinagre-bookmarks-tree.h vinagre-bookmarks-tree.c \ - vinagre-bookmarks-migration.h vinagre-bookmarks-migration.c \ - $(NULL) - -if AVAHI -vinagre_applet_SOURCES += vinagre-mdns.h vinagre-mdns.c -endif - -vinagre_applet_LDADD = \ - $(APPLET_LIBS) \ - $(VINAGRE_LIBS) \ - $(AVAHI_LIBS) \ - $(NULL) - - -############################## -# Autogenerated stuff -############################## - -vinagre_enum_headers = \ - $(top_srcdir)/src/vinagre-connection.h \ - $(NULL) - -vinagre-enums.c: @REBUILD@ $(vinagre_enum_headers) - glib-mkenums --fhead "#include \n" \ - --fhead "#include \"vinagre-enums.h\"\n\n" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --fprod "\n#include \"@filename@\"\n" \ - --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};\n\n" \ - --vtail "GType\n@enum_name@_get_type (void)\n{\n" \ - --vtail " static GType type = 0;\n\n" \ - --vtail " if (!type)\n" \ - --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ - --vtail " return type;\n}\n\n" \ - $(vinagre_enum_headers) > $@ - -vinagre-enums.h: @REBUILD@ $(vinagre_enum_headers) - glib-mkenums --fhead "#ifndef __VINAGRE_ENUMS_H__\n" \ - --fhead "#define __VINAGRE_ENUMS_H__ 1\n\n" \ - --fhead "G_BEGIN_DECLS\n\n" \ - --ftail "G_END_DECLS\n\n" \ - --ftail "#endif /* __VINAGRE_ENUMS_H__ */\n" \ - --fprod "\n/* --- @filename@ --- */" \ - --eprod "#define VINAGRE_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ - --eprod "GType @enum_name@_get_type (void);\n" \ - $(vinagre_enum_headers) > $@ - -BUILT_SOURCES = \ - vinagre-enums.c \ - vinagre-enums.h \ - $(NULL) - -DISTCLEANFILES = \ - $(BUILT_SOURCES) \ - $(server_in_files) \ - $(server_DATA) \ - $(NULL) - -EXTRA_DIST = \ - GNOME_VinagreApplet.server.in.in \ - $(NULL) - -dist-hook: - cd $(distdir) ; rm -f $(DISTCLEANFILES) - -$(vinagre_OBJECTS): $(BUILT_SOURCES) diff -Nru vinagre-2.26.1/src/Makefile.in vinagre-2.29.1/src/Makefile.in --- vinagre-2.26.1/src/Makefile.in 2009-04-13 14:35:36.000000000 +0100 +++ vinagre-2.29.1/src/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,1045 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -bin_PROGRAMS = vinagre$(EXEEXT) -@AVAHI_TRUE@am__append_1 = vinagre-mdns.h vinagre-mdns.c -libexec_PROGRAMS = vinagre-applet$(EXEEXT) -@AVAHI_TRUE@am__append_2 = vinagre-mdns.h vinagre-mdns.c -subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ - "$(DESTDIR)$(serverdir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) -am__vinagre_SOURCES_DIST = vinagre-commands.c vinagre-commands.h \ - vinagre-connect.c vinagre-connect.h vinagre-connection.c \ - vinagre-connection.h vinagre-fav.c vinagre-fav.h \ - vinagre-bookmarks.c vinagre-bookmarks.h vinagre-main.c \ - vinagre-notebook.c vinagre-notebook.h vinagre-tab.c \ - vinagre-tab.h vinagre-utils.c vinagre-utils.h vinagre-window.c \ - vinagre-window.h vinagre-ui.h vinagre-window-private.h \ - vinagre-enums.h vinagre-enums.c vinagre-prefs.h \ - vinagre-prefs.c bacon-message-connection.h \ - bacon-message-connection.c vinagre-app.h vinagre-app.c \ - vinagre-bacon.h vinagre-bacon.c vinagre-bookmarks-entry.h \ - vinagre-bookmarks-entry.c vinagre-bookmarks-tree.h \ - vinagre-bookmarks-tree.c vinagre-bookmarks-ui.h \ - vinagre-bookmarks-ui.c vinagre-bookmarks-migration.h \ - vinagre-bookmarks-migration.c vinagre-mdns.h vinagre-mdns.c -am__objects_1 = -@AVAHI_TRUE@am__objects_2 = vinagre-mdns.$(OBJEXT) -am_vinagre_OBJECTS = vinagre-commands.$(OBJEXT) \ - vinagre-connect.$(OBJEXT) vinagre-connection.$(OBJEXT) \ - vinagre-fav.$(OBJEXT) vinagre-bookmarks.$(OBJEXT) \ - vinagre-main.$(OBJEXT) vinagre-notebook.$(OBJEXT) \ - vinagre-tab.$(OBJEXT) vinagre-utils.$(OBJEXT) \ - vinagre-window.$(OBJEXT) vinagre-enums.$(OBJEXT) \ - vinagre-prefs.$(OBJEXT) bacon-message-connection.$(OBJEXT) \ - vinagre-app.$(OBJEXT) vinagre-bacon.$(OBJEXT) \ - vinagre-bookmarks-entry.$(OBJEXT) \ - vinagre-bookmarks-tree.$(OBJEXT) \ - vinagre-bookmarks-ui.$(OBJEXT) \ - vinagre-bookmarks-migration.$(OBJEXT) $(am__objects_1) \ - $(am__objects_2) -vinagre_OBJECTS = $(am_vinagre_OBJECTS) -am__DEPENDENCIES_1 = -vinagre_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - view/libview.la $(am__DEPENDENCIES_1) -am__vinagre_applet_SOURCES_DIST = vinagre-applet.c vinagre-bookmarks.h \ - vinagre-bookmarks.c vinagre-connection.h vinagre-connection.c \ - vinagre-utils.h vinagre-utils.c vinagre-enums.h \ - vinagre-enums.c vinagre-bookmarks-entry.h \ - vinagre-bookmarks-entry.c vinagre-bookmarks-tree.h \ - vinagre-bookmarks-tree.c vinagre-bookmarks-migration.h \ - vinagre-bookmarks-migration.c vinagre-mdns.h vinagre-mdns.c -@AVAHI_TRUE@am__objects_3 = vinagre_applet-vinagre-mdns.$(OBJEXT) -am_vinagre_applet_OBJECTS = vinagre_applet-vinagre-applet.$(OBJEXT) \ - vinagre_applet-vinagre-bookmarks.$(OBJEXT) \ - vinagre_applet-vinagre-connection.$(OBJEXT) \ - vinagre_applet-vinagre-utils.$(OBJEXT) \ - vinagre_applet-vinagre-enums.$(OBJEXT) \ - vinagre_applet-vinagre-bookmarks-entry.$(OBJEXT) \ - vinagre_applet-vinagre-bookmarks-tree.$(OBJEXT) \ - vinagre_applet-vinagre-bookmarks-migration.$(OBJEXT) \ - $(am__objects_1) $(am__objects_3) -vinagre_applet_OBJECTS = $(am_vinagre_applet_OBJECTS) -vinagre_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -vinagre_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(vinagre_applet_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(vinagre_SOURCES) $(vinagre_applet_SOURCES) -DIST_SOURCES = $(am__vinagre_SOURCES_DIST) \ - $(am__vinagre_applet_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -serverDATA_INSTALL = $(INSTALL_DATA) -DATA = $(server_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AVAHI_CFLAGS = @AVAHI_CFLAGS@ -AVAHI_LIBS = @AVAHI_LIBS@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HELP_DIR = @HELP_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -REBUILD = @REBUILD@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ -VINAGRE_LIBS = @VINAGRE_LIBS@ -WARN_CFLAGS = @WARN_CFLAGS@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = view -NULL = - -############################## -# The main binary -############################## -INCLUDES = \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DVINAGRE_DATADIR=\""$(datadir)/vinagre"\" \ - -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ - $(VINAGRE_CFLAGS) \ - $(AVAHI_CFLAGS) \ - $(NULL) - -vinagre_SOURCES = vinagre-commands.c vinagre-commands.h \ - vinagre-connect.c vinagre-connect.h vinagre-connection.c \ - vinagre-connection.h vinagre-fav.c vinagre-fav.h \ - vinagre-bookmarks.c vinagre-bookmarks.h vinagre-main.c \ - vinagre-notebook.c vinagre-notebook.h vinagre-tab.c \ - vinagre-tab.h vinagre-utils.c vinagre-utils.h vinagre-window.c \ - vinagre-window.h vinagre-ui.h vinagre-window-private.h \ - vinagre-enums.h vinagre-enums.c vinagre-prefs.h \ - vinagre-prefs.c bacon-message-connection.h \ - bacon-message-connection.c vinagre-app.h vinagre-app.c \ - vinagre-bacon.h vinagre-bacon.c vinagre-bookmarks-entry.h \ - vinagre-bookmarks-entry.c vinagre-bookmarks-tree.h \ - vinagre-bookmarks-tree.c vinagre-bookmarks-ui.h \ - vinagre-bookmarks-ui.c vinagre-bookmarks-migration.h \ - vinagre-bookmarks-migration.c $(NULL) $(am__append_1) -vinagre_LDADD = \ - $(VINAGRE_LIBS) \ - $(AVAHI_LIBS) \ - $(GTKVNC_LIBS) \ - view/libview.la \ - $(NULL) - - -############################## -# Bonobo .server -############################## -serverdir = \ - $(libdir)/bonobo/servers - -server_in_files = \ - GNOME_VinagreApplet.server.in - -server_DATA = \ - $(server_in_files:.server.in=.server) - -vinagre_applet_CFLAGS = \ - $(APPLET_CFLAGS) \ - $(AVAHI_CFLAGS) \ - $(NULL) - -vinagre_applet_SOURCES = vinagre-applet.c vinagre-bookmarks.h \ - vinagre-bookmarks.c vinagre-connection.h vinagre-connection.c \ - vinagre-utils.h vinagre-utils.c vinagre-enums.h \ - vinagre-enums.c vinagre-bookmarks-entry.h \ - vinagre-bookmarks-entry.c vinagre-bookmarks-tree.h \ - vinagre-bookmarks-tree.c vinagre-bookmarks-migration.h \ - vinagre-bookmarks-migration.c $(NULL) $(am__append_2) -vinagre_applet_LDADD = \ - $(APPLET_LIBS) \ - $(VINAGRE_LIBS) \ - $(AVAHI_LIBS) \ - $(NULL) - - -############################## -# Autogenerated stuff -############################## -vinagre_enum_headers = \ - $(top_srcdir)/src/vinagre-connection.h \ - $(NULL) - -BUILT_SOURCES = \ - vinagre-enums.c \ - vinagre-enums.h \ - $(NULL) - -DISTCLEANFILES = \ - $(BUILT_SOURCES) \ - $(server_in_files) \ - $(server_DATA) \ - $(NULL) - -EXTRA_DIST = \ - GNOME_VinagreApplet.server.in.in \ - $(NULL) - -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -install-libexecPROGRAMS: $(libexec_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" - @list='$(libexec_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-libexecPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(libexec_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \ - rm -f "$(DESTDIR)$(libexecdir)/$$f"; \ - done - -clean-libexecPROGRAMS: - @list='$(libexec_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -vinagre$(EXEEXT): $(vinagre_OBJECTS) $(vinagre_DEPENDENCIES) - @rm -f vinagre$(EXEEXT) - $(LINK) $(vinagre_OBJECTS) $(vinagre_LDADD) $(LIBS) -vinagre-applet$(EXEEXT): $(vinagre_applet_OBJECTS) $(vinagre_applet_DEPENDENCIES) - @rm -f vinagre-applet$(EXEEXT) - $(vinagre_applet_LINK) $(vinagre_applet_OBJECTS) $(vinagre_applet_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bacon-message-connection.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-app.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bacon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks-entry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks-migration.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks-tree.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks-ui.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-commands.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-connect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-connection.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-enums.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-fav.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-mdns.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-notebook.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-prefs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-tab.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-window.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-applet.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-bookmarks.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-connection.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-enums.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-mdns.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-utils.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -vinagre_applet-vinagre-applet.o: vinagre-applet.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-applet.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-applet.Tpo -c -o vinagre_applet-vinagre-applet.o `test -f 'vinagre-applet.c' || echo '$(srcdir)/'`vinagre-applet.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-applet.Tpo $(DEPDIR)/vinagre_applet-vinagre-applet.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-applet.c' object='vinagre_applet-vinagre-applet.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-applet.o `test -f 'vinagre-applet.c' || echo '$(srcdir)/'`vinagre-applet.c - -vinagre_applet-vinagre-applet.obj: vinagre-applet.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-applet.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-applet.Tpo -c -o vinagre_applet-vinagre-applet.obj `if test -f 'vinagre-applet.c'; then $(CYGPATH_W) 'vinagre-applet.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-applet.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-applet.Tpo $(DEPDIR)/vinagre_applet-vinagre-applet.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-applet.c' object='vinagre_applet-vinagre-applet.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-applet.obj `if test -f 'vinagre-applet.c'; then $(CYGPATH_W) 'vinagre-applet.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-applet.c'; fi` - -vinagre_applet-vinagre-bookmarks.o: vinagre-bookmarks.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Tpo -c -o vinagre_applet-vinagre-bookmarks.o `test -f 'vinagre-bookmarks.c' || echo '$(srcdir)/'`vinagre-bookmarks.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks.c' object='vinagre_applet-vinagre-bookmarks.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks.o `test -f 'vinagre-bookmarks.c' || echo '$(srcdir)/'`vinagre-bookmarks.c - -vinagre_applet-vinagre-bookmarks.obj: vinagre-bookmarks.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Tpo -c -o vinagre_applet-vinagre-bookmarks.obj `if test -f 'vinagre-bookmarks.c'; then $(CYGPATH_W) 'vinagre-bookmarks.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks.c' object='vinagre_applet-vinagre-bookmarks.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks.obj `if test -f 'vinagre-bookmarks.c'; then $(CYGPATH_W) 'vinagre-bookmarks.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks.c'; fi` - -vinagre_applet-vinagre-connection.o: vinagre-connection.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-connection.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-connection.Tpo -c -o vinagre_applet-vinagre-connection.o `test -f 'vinagre-connection.c' || echo '$(srcdir)/'`vinagre-connection.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-connection.Tpo $(DEPDIR)/vinagre_applet-vinagre-connection.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-connection.c' object='vinagre_applet-vinagre-connection.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-connection.o `test -f 'vinagre-connection.c' || echo '$(srcdir)/'`vinagre-connection.c - -vinagre_applet-vinagre-connection.obj: vinagre-connection.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-connection.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-connection.Tpo -c -o vinagre_applet-vinagre-connection.obj `if test -f 'vinagre-connection.c'; then $(CYGPATH_W) 'vinagre-connection.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-connection.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-connection.Tpo $(DEPDIR)/vinagre_applet-vinagre-connection.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-connection.c' object='vinagre_applet-vinagre-connection.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-connection.obj `if test -f 'vinagre-connection.c'; then $(CYGPATH_W) 'vinagre-connection.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-connection.c'; fi` - -vinagre_applet-vinagre-utils.o: vinagre-utils.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-utils.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-utils.Tpo -c -o vinagre_applet-vinagre-utils.o `test -f 'vinagre-utils.c' || echo '$(srcdir)/'`vinagre-utils.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-utils.Tpo $(DEPDIR)/vinagre_applet-vinagre-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-utils.c' object='vinagre_applet-vinagre-utils.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-utils.o `test -f 'vinagre-utils.c' || echo '$(srcdir)/'`vinagre-utils.c - -vinagre_applet-vinagre-utils.obj: vinagre-utils.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-utils.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-utils.Tpo -c -o vinagre_applet-vinagre-utils.obj `if test -f 'vinagre-utils.c'; then $(CYGPATH_W) 'vinagre-utils.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-utils.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-utils.Tpo $(DEPDIR)/vinagre_applet-vinagre-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-utils.c' object='vinagre_applet-vinagre-utils.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-utils.obj `if test -f 'vinagre-utils.c'; then $(CYGPATH_W) 'vinagre-utils.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-utils.c'; fi` - -vinagre_applet-vinagre-enums.o: vinagre-enums.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-enums.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-enums.Tpo -c -o vinagre_applet-vinagre-enums.o `test -f 'vinagre-enums.c' || echo '$(srcdir)/'`vinagre-enums.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-enums.Tpo $(DEPDIR)/vinagre_applet-vinagre-enums.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-enums.c' object='vinagre_applet-vinagre-enums.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-enums.o `test -f 'vinagre-enums.c' || echo '$(srcdir)/'`vinagre-enums.c - -vinagre_applet-vinagre-enums.obj: vinagre-enums.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-enums.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-enums.Tpo -c -o vinagre_applet-vinagre-enums.obj `if test -f 'vinagre-enums.c'; then $(CYGPATH_W) 'vinagre-enums.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-enums.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-enums.Tpo $(DEPDIR)/vinagre_applet-vinagre-enums.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-enums.c' object='vinagre_applet-vinagre-enums.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-enums.obj `if test -f 'vinagre-enums.c'; then $(CYGPATH_W) 'vinagre-enums.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-enums.c'; fi` - -vinagre_applet-vinagre-bookmarks-entry.o: vinagre-bookmarks-entry.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-entry.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Tpo -c -o vinagre_applet-vinagre-bookmarks-entry.o `test -f 'vinagre-bookmarks-entry.c' || echo '$(srcdir)/'`vinagre-bookmarks-entry.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-entry.c' object='vinagre_applet-vinagre-bookmarks-entry.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-entry.o `test -f 'vinagre-bookmarks-entry.c' || echo '$(srcdir)/'`vinagre-bookmarks-entry.c - -vinagre_applet-vinagre-bookmarks-entry.obj: vinagre-bookmarks-entry.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-entry.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Tpo -c -o vinagre_applet-vinagre-bookmarks-entry.obj `if test -f 'vinagre-bookmarks-entry.c'; then $(CYGPATH_W) 'vinagre-bookmarks-entry.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-entry.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-entry.c' object='vinagre_applet-vinagre-bookmarks-entry.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-entry.obj `if test -f 'vinagre-bookmarks-entry.c'; then $(CYGPATH_W) 'vinagre-bookmarks-entry.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-entry.c'; fi` - -vinagre_applet-vinagre-bookmarks-tree.o: vinagre-bookmarks-tree.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-tree.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Tpo -c -o vinagre_applet-vinagre-bookmarks-tree.o `test -f 'vinagre-bookmarks-tree.c' || echo '$(srcdir)/'`vinagre-bookmarks-tree.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-tree.c' object='vinagre_applet-vinagre-bookmarks-tree.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-tree.o `test -f 'vinagre-bookmarks-tree.c' || echo '$(srcdir)/'`vinagre-bookmarks-tree.c - -vinagre_applet-vinagre-bookmarks-tree.obj: vinagre-bookmarks-tree.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-tree.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Tpo -c -o vinagre_applet-vinagre-bookmarks-tree.obj `if test -f 'vinagre-bookmarks-tree.c'; then $(CYGPATH_W) 'vinagre-bookmarks-tree.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-tree.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-tree.c' object='vinagre_applet-vinagre-bookmarks-tree.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-tree.obj `if test -f 'vinagre-bookmarks-tree.c'; then $(CYGPATH_W) 'vinagre-bookmarks-tree.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-tree.c'; fi` - -vinagre_applet-vinagre-bookmarks-migration.o: vinagre-bookmarks-migration.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-migration.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Tpo -c -o vinagre_applet-vinagre-bookmarks-migration.o `test -f 'vinagre-bookmarks-migration.c' || echo '$(srcdir)/'`vinagre-bookmarks-migration.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-migration.c' object='vinagre_applet-vinagre-bookmarks-migration.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-migration.o `test -f 'vinagre-bookmarks-migration.c' || echo '$(srcdir)/'`vinagre-bookmarks-migration.c - -vinagre_applet-vinagre-bookmarks-migration.obj: vinagre-bookmarks-migration.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-migration.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Tpo -c -o vinagre_applet-vinagre-bookmarks-migration.obj `if test -f 'vinagre-bookmarks-migration.c'; then $(CYGPATH_W) 'vinagre-bookmarks-migration.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-migration.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-migration.c' object='vinagre_applet-vinagre-bookmarks-migration.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-migration.obj `if test -f 'vinagre-bookmarks-migration.c'; then $(CYGPATH_W) 'vinagre-bookmarks-migration.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-migration.c'; fi` - -vinagre_applet-vinagre-mdns.o: vinagre-mdns.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-mdns.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-mdns.Tpo -c -o vinagre_applet-vinagre-mdns.o `test -f 'vinagre-mdns.c' || echo '$(srcdir)/'`vinagre-mdns.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-mdns.Tpo $(DEPDIR)/vinagre_applet-vinagre-mdns.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-mdns.c' object='vinagre_applet-vinagre-mdns.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-mdns.o `test -f 'vinagre-mdns.c' || echo '$(srcdir)/'`vinagre-mdns.c - -vinagre_applet-vinagre-mdns.obj: vinagre-mdns.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-mdns.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-mdns.Tpo -c -o vinagre_applet-vinagre-mdns.obj `if test -f 'vinagre-mdns.c'; then $(CYGPATH_W) 'vinagre-mdns.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-mdns.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/vinagre_applet-vinagre-mdns.Tpo $(DEPDIR)/vinagre_applet-vinagre-mdns.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-mdns.c' object='vinagre_applet-vinagre-mdns.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-mdns.obj `if test -f 'vinagre-mdns.c'; then $(CYGPATH_W) 'vinagre-mdns.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-mdns.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-serverDATA: $(server_DATA) - @$(NORMAL_INSTALL) - test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" - @list='$(server_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \ - $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \ - done - -uninstall-serverDATA: - @$(NORMAL_UNINSTALL) - @list='$(server_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \ - rm -f "$(DESTDIR)$(serverdir)/$$f"; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ - done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(PROGRAMS) $(DATA) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(serverdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-recursive - -clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-serverDATA - -install-dvi: install-dvi-recursive - -install-exec-am: install-binPROGRAMS install-libexecPROGRAMS - -install-html: install-html-recursive - -install-info: install-info-recursive - -install-man: - -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS \ - uninstall-serverDATA - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libexecPROGRAMS clean-libtool ctags \ - ctags-recursive dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-serverDATA install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-libexecPROGRAMS \ - uninstall-serverDATA - - -$(server_in_files): $(server_in_files:.server.in=.server.in.in) - sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ - -@INTLTOOL_SERVER_RULE@ - -vinagre-enums.c: @REBUILD@ $(vinagre_enum_headers) - glib-mkenums --fhead "#include \n" \ - --fhead "#include \"vinagre-enums.h\"\n\n" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --fprod "\n#include \"@filename@\"\n" \ - --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};\n\n" \ - --vtail "GType\n@enum_name@_get_type (void)\n{\n" \ - --vtail " static GType type = 0;\n\n" \ - --vtail " if (!type)\n" \ - --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ - --vtail " return type;\n}\n\n" \ - $(vinagre_enum_headers) > $@ - -vinagre-enums.h: @REBUILD@ $(vinagre_enum_headers) - glib-mkenums --fhead "#ifndef __VINAGRE_ENUMS_H__\n" \ - --fhead "#define __VINAGRE_ENUMS_H__ 1\n\n" \ - --fhead "G_BEGIN_DECLS\n\n" \ - --ftail "G_END_DECLS\n\n" \ - --ftail "#endif /* __VINAGRE_ENUMS_H__ */\n" \ - --fprod "\n/* --- @filename@ --- */" \ - --eprod "#define VINAGRE_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ - --eprod "GType @enum_name@_get_type (void);\n" \ - $(vinagre_enum_headers) > $@ - -dist-hook: - cd $(distdir) ; rm -f $(DISTCLEANFILES) - -$(vinagre_OBJECTS): $(BUILT_SOURCES) -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru vinagre-2.26.1/src/view/autoDrawer.c vinagre-2.29.1/src/view/autoDrawer.c --- vinagre-2.26.1/src/view/autoDrawer.c 2008-06-03 00:19:44.000000000 +0100 +++ vinagre-2.29.1/src/view/autoDrawer.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,889 +0,0 @@ -/* ************************************************************************* - * Copyright (c) 2005 VMware Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * *************************************************************************/ - -/* - * autoDrawer.c - - * - * Subclass of ViewDrawer that encapsulates the behaviour typically required - * when using the drawer to implement a menu/toolbar that auto-opens when - * moused-over and auto-closes when the mouse leaves. - */ - - -#include "autoDrawer.h" - - -struct _ViewAutoDrawerPrivate -{ - gboolean active; - gboolean pinned; - gboolean inputUngrabbed; - - gboolean opened; - - gboolean fill; - gint offset; - - guint delayConnection; - guint delayValue; - guint overlapPixels; - guint noOverlapPixels; - - GtkWidget *over; - GtkWidget *evBox; -}; - -#define VIEW_AUTODRAWER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), VIEW_TYPE_AUTODRAWER, ViewAutoDrawerPrivate)) - -/* The unaltered parent class. */ -static ViewDrawerClass *parentClass; - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerEnforce -- - * - * Enforce an AutoDrawer's goal now. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewAutoDrawerEnforce(ViewAutoDrawer *that, // IN - gboolean animate) // IN -{ - double fraction; - ViewAutoDrawerPrivate *priv = that->priv; - - if (!priv->active) { - ViewOvBox_SetMin(VIEW_OV_BOX(that), -1); - ViewOvBox_SetFraction(VIEW_OV_BOX(that), 0); - return; - } - - g_assert(priv->over != NULL); - g_assert(GTK_IS_WIDGET(priv->over)); - - ViewOvBox_SetMin(VIEW_OV_BOX(that), priv->noOverlapPixels); - fraction = priv->opened - ? 1 : ((double)priv->overlapPixels / priv->over->allocation.height); - if (!animate) { - ViewOvBox_SetFraction(VIEW_OV_BOX(that), fraction); - } - ViewDrawer_SetGoal(VIEW_DRAWER(that), fraction); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerOnEnforceDelay -- - * - * Callback fired when a delayed update happens to update the drawer state. - * - * Results: - * FALSE to indicate timer should not repeat. - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static gboolean -ViewAutoDrawerOnEnforceDelay(ViewAutoDrawer *that) // IN -{ - that->priv->delayConnection = 0; - ViewAutoDrawerEnforce(that, TRUE); - - return FALSE; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerUpdate -- - * - * Decide whether an AutoDrawer should be opened or closed, and enforce - * that decision now or later. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN - gboolean immediate) // IN -{ - ViewAutoDrawerPrivate *priv = that->priv; - GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(that)); - GtkWindow *window; - - if (!toplevel || !GTK_WIDGET_TOPLEVEL(toplevel)) { - // The autoDrawer cannot function properly without a toplevel. - return; - } - window = GTK_WINDOW(toplevel); - - /* - * We decide to open the drawer by OR'ing several conditions. Evaluating a - * condition can have the side-effect of setting 'immediate' to TRUE, so we - * cannot stop evaluating the conditions after we have found one to be TRUE. - */ - - priv->opened = FALSE; - - /* Is the AutoDrawer pinned? */ - - if (priv->pinned) { - immediate = TRUE; - - priv->opened = TRUE; - } - - /* Is the mouse cursor inside the event box? */ - - { - int x; - int y; - - gtk_widget_get_pointer(priv->evBox, &x, &y); - g_assert(gtk_container_get_border_width( GTK_CONTAINER(priv->evBox)) - == 0); - if ( (guint)x < (guint)priv->evBox->allocation.width - && (guint)y < (guint)priv->evBox->allocation.height) { - priv->opened = TRUE; - } - } - - /* If there is a focused widget, is it inside the event box? */ - - { - GtkWidget *focus; - - focus = gtk_window_get_focus(window); - if (focus && gtk_widget_is_ancestor(focus, priv->evBox)) { - /* - * Override the default 'immediate' to make sure the 'over' widget - * immediately appears along with the widget the focused widget. - */ - immediate = TRUE; - - priv->opened = TRUE; - } - } - - /* If input is grabbed, is it on behalf of a widget inside the event box? */ - - if (!priv->inputUngrabbed) { - GtkWidget *grabbed = NULL; - - if (window->group && window->group->grabs) { - grabbed = GTK_WIDGET(window->group->grabs->data); - } - if (!grabbed) { - grabbed = gtk_grab_get_current(); - } - g_assert(grabbed); - - if (GTK_IS_MENU(grabbed)) { - /* - * With cascading menus, the deepest menu owns the grab. Traverse the - * menu hierarchy up until we reach the attach widget for the whole - * hierarchy. - */ - - for (;;) { - GtkWidget *menuAttach; - GtkWidget *menuItemParent; - - menuAttach = gtk_menu_get_attach_widget(GTK_MENU(grabbed)); - if (!menuAttach) { - /* - * It is unfortunately not mandatory for a menu to have a proper - * attach widget set. - */ - break; - } - - grabbed = menuAttach; - if (!GTK_IS_MENU_ITEM(grabbed)) { - break; - } - - menuItemParent = gtk_widget_get_parent(grabbed); - g_return_if_fail(menuItemParent); - if (!GTK_IS_MENU(menuItemParent)) { - break; - } - - grabbed = menuItemParent; - } - } - - if (gtk_widget_is_ancestor(grabbed, priv->evBox)) { - /* - * Override the default 'immediate' to make sure the 'over' widget - * immediately appears along with the widget the grab happens on - * behalf of. - */ - immediate = TRUE; - - priv->opened = TRUE; - } - } - - if (priv->delayConnection) { - g_source_remove(priv->delayConnection); - } - if (immediate) { - ViewAutoDrawerEnforce(that, FALSE); - } else { - priv->delayConnection = g_timeout_add(priv->delayValue, - (GSourceFunc)ViewAutoDrawerOnEnforceDelay, that); - } -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerOnOverEnterLeave -- - * - * Respond to enter/leave events by doing a delayed update of the drawer - * state. - * - * Results: - * FALSE to indicate event was not handled. - * - * Side effects: - * Will queue delayed update. - * - *----------------------------------------------------------------------------- - */ - -static gboolean -ViewAutoDrawerOnOverEnterLeave(GtkWidget *evBox, // IN: Unused - GdkEventCrossing *event, // IN - ViewAutoDrawer *that) // IN -{ - /* - * This change happens in response to user input. By default, give the user - * some time to correct his input before reacting to the change. - */ - ViewAutoDrawerUpdate(that, FALSE); - - return FALSE; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerOnGrabNotify -- - * - * Respond to grab notifications by updating the drawer state. - * - * Results: - * None - * - * Side effects: - * Might queue delayed update. - * - *----------------------------------------------------------------------------- - */ - -static void -ViewAutoDrawerOnGrabNotify(GtkWidget *evBox, // IN: Unused - gboolean ungrabbed, // IN - ViewAutoDrawer *that) // IN -{ - ViewAutoDrawerPrivate *priv = that->priv; - - priv->inputUngrabbed = ungrabbed; - - /* - * This change happens in response to user input. By default, give the user - * some time to correct his input before reacting to the change. - */ - ViewAutoDrawerUpdate(that, FALSE); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerOnSetFocus -- - * - * Respond to changes in the focus widget of the autoDrawer's toplevel - * by recalculating the state. - * - * Results: - * None - * - * Side effects: - * Drawer state is updated. - * - *----------------------------------------------------------------------------- - */ - -static void -ViewAutoDrawerOnSetFocus(GtkWindow *window, // IN - GtkWidget *widget, // IN - ViewAutoDrawer *that) // IN -{ - /* - * This change happens in response to user input. By default, give the user - * some time to correct his input before reacting to the change. - */ - ViewAutoDrawerUpdate(that, FALSE); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerOnHierarchyChanged -- - * - * Respond to changes in the toplevel for the AutoDrawer. A toplevel is - * required for the AutoDrawer to calculate its state. - * - * Results: - * None - * - * Side effects: - * Drawer state is updated. - * - *----------------------------------------------------------------------------- - */ - -static void -ViewAutoDrawerOnHierarchyChanged(ViewAutoDrawer *that, // IN - GtkWidget *oldToplevel) // IN -{ - GtkWidget *newToplevel = gtk_widget_get_toplevel(GTK_WIDGET(that)); - - if (oldToplevel && GTK_WIDGET_TOPLEVEL(oldToplevel)) { - g_signal_handlers_disconnect_by_func(oldToplevel, - G_CALLBACK(ViewAutoDrawerOnSetFocus), - that); - } - - if (newToplevel && GTK_WIDGET_TOPLEVEL(newToplevel)) { - g_signal_connect_after(newToplevel, "set-focus", - G_CALLBACK(ViewAutoDrawerOnSetFocus), that); - } - - /* This change happens programmatically. Always react to it immediately. */ - ViewAutoDrawerUpdate(that, TRUE); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerSetOver -- - * - * Virtual method override so that the user's over widget is placed - * inside the AutoDrawer's event box. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewAutoDrawerSetOver(ViewOvBox *ovBox, // IN - GtkWidget *widget) // IN -{ - ViewAutoDrawer *that = VIEW_AUTODRAWER(ovBox); - ViewAutoDrawerPrivate *priv = that->priv; - GtkWidget *oldChild = gtk_bin_get_child(GTK_BIN(priv->evBox)); - - if (oldChild) { - g_object_ref(oldChild); - gtk_container_remove(GTK_CONTAINER(priv->evBox), oldChild); - } - - if (widget) { - gtk_container_add(GTK_CONTAINER(priv->evBox), widget); - } - - if (oldChild) { - g_object_unref(oldChild); - } - - priv->over = widget; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerRefreshPacking -- - * - * Sets the actual packing values for fill, expand, and packing - * given internal settings. - * - * Results: - * None - * - * Side effects: - * Drawer state is updated. - * - *----------------------------------------------------------------------------- - */ - -void -ViewAutoDrawerRefreshPacking(ViewAutoDrawer *that) // IN -{ - gboolean expand; - gboolean fill; - guint padding; - - expand = (that->priv->fill || (that->priv->offset < 0)); - fill = that->priv->fill; - padding = (expand || fill) ? 0 : that->priv->offset; - - gtk_box_set_child_packing(GTK_BOX(that), that->priv->evBox, - expand, fill, padding, GTK_PACK_START); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerInit -- - * - * Initialize a ViewAutoDrawer. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewAutoDrawerInit(GTypeInstance *instance, // IN - gpointer klass) // Unused -{ - ViewAutoDrawer *that; - ViewAutoDrawerPrivate *priv; - - that = VIEW_AUTODRAWER(instance); - that->priv = VIEW_AUTODRAWER_GET_PRIVATE(that); - priv = that->priv; - - priv->active = TRUE; - priv->pinned = FALSE; - priv->inputUngrabbed = TRUE; - priv->delayConnection = 0; - priv->delayValue = 250; - priv->overlapPixels = 0; - priv->noOverlapPixels = 1; - - priv->fill = TRUE; - priv->offset = -1; - - priv->evBox = gtk_event_box_new(); - gtk_widget_show(priv->evBox); - VIEW_OV_BOX_CLASS(parentClass)->set_over(VIEW_OV_BOX(that), priv->evBox); - - g_signal_connect(priv->evBox, "enter-notify-event", - G_CALLBACK(ViewAutoDrawerOnOverEnterLeave), that); - g_signal_connect(priv->evBox, "leave-notify-event", - G_CALLBACK(ViewAutoDrawerOnOverEnterLeave), that); - g_signal_connect(priv->evBox, "grab-notify", - G_CALLBACK(ViewAutoDrawerOnGrabNotify), that); - - g_signal_connect(that, "hierarchy-changed", - G_CALLBACK(ViewAutoDrawerOnHierarchyChanged), NULL); - - /* This change happens programmatically. Always react to it immediately. */ - ViewAutoDrawerUpdate(that, TRUE); - - ViewAutoDrawerRefreshPacking(that); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerFinalize -- - * - * "finalize" method of a ViewAutoDrawer. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewAutoDrawerFinalize(GObject *object) // IN -{ - ViewAutoDrawer *that; - - that = VIEW_AUTODRAWER(object); - if (that->priv->delayConnection) { - g_source_remove(that->priv->delayConnection); - } - - G_OBJECT_CLASS(parentClass)->finalize(object); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawerClassInit -- - * - * Initialize the ViewAutoDrawerClass. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewAutoDrawerClassInit(gpointer klass) // IN -{ - GObjectClass *objectClass = G_OBJECT_CLASS(klass); - ViewOvBoxClass *ovBoxClass = VIEW_OV_BOX_CLASS(klass); - - parentClass = g_type_class_peek_parent(klass); - - objectClass->finalize = ViewAutoDrawerFinalize; - - ovBoxClass->set_over = ViewAutoDrawerSetOver; - - g_type_class_add_private(objectClass, sizeof(ViewAutoDrawerPrivate)); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawer_GetType -- - * - * Get the (memoized) GType of the ViewAutoDrawer GTK+ object. - * - * Results: - * The GType - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -GType -ViewAutoDrawer_GetType(void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo info = { - sizeof (ViewAutoDrawerClass), - NULL, /* BaseInit */ - NULL, /* BaseFinalize */ - (GClassInitFunc)ViewAutoDrawerClassInit, - NULL, - NULL, /* Class Data */ - sizeof (ViewAutoDrawer), - 0, /* n_preallocs */ - (GInstanceInitFunc)ViewAutoDrawerInit, - }; - - type = g_type_register_static(VIEW_TYPE_DRAWER, "ViewAutoDrawer", &info, 0); - } - - return type; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawer_New -- - * - * Create a new ViewAutoDrawer GTK+ widget. - * - * Results: - * The widget - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -GtkWidget * -ViewAutoDrawer_New(void) -{ - return GTK_WIDGET(g_object_new(VIEW_TYPE_AUTODRAWER, NULL)); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawer_SetSlideDelay -- - * - * Set the response time of an AutoDrawer in ms., i.e. the time that - * elapses between: - * - when the AutoDrawer notices a change that can impact the outcome of - * the decision to open or close the drawer, - * and - * - when the AutoDrawer makes such decision. - * - * Users move the mouse inaccurately. If they temporarily move the mouse in - * or out of the AutoDrawer for less than the reponse time, their move will - * be ignored. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -void -ViewAutoDrawer_SetSlideDelay(ViewAutoDrawer *that, // IN - guint delay) // IN -{ - g_return_if_fail(VIEW_IS_AUTODRAWER(that)); - - that->priv->delayValue = delay; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawer_SetOverlapPixels -- - * - * Set the number of pixels that the over widget overlaps the under widget - * when not open. - * - * Results: - * None - * - * Side effects: - * Drawer state is updated. - * - *----------------------------------------------------------------------------- - */ - -void -ViewAutoDrawer_SetOverlapPixels(ViewAutoDrawer *that, // IN - guint overlapPixels) // IN -{ - g_return_if_fail(VIEW_IS_AUTODRAWER(that)); - - that->priv->overlapPixels = overlapPixels; - - /* This change happens programmatically. Always react to it immediately. */ - ViewAutoDrawerUpdate(that, TRUE); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawer_SetNoOverlapPixels -- - * - * Set the number of pixels that the drawer reserves when not open. The - * over widget does not overlap the under widget over these pixels. - * - * Results: - * None - * - * Side effects: - * Drawer state is updated. - * - *----------------------------------------------------------------------------- - */ - -void -ViewAutoDrawer_SetNoOverlapPixels(ViewAutoDrawer *that, // IN - guint noOverlapPixels) // IN -{ - g_return_if_fail(VIEW_IS_AUTODRAWER(that)); - - that->priv->noOverlapPixels = noOverlapPixels; - - /* This change happens programmatically. Always react to it immediately. */ - ViewAutoDrawerUpdate(that, TRUE); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawer_SetActive -- - * - * Set whether the AutoDrawer is active or not. That is to say, whether - * it is acting as a drawer or not. When inactive, the over and under - * widget do not overlap and the net result is very much like a vbox. - * - * Results: - * None - * - * Side effects: - * Drawer state is updated. - * - *----------------------------------------------------------------------------- - */ - -void -ViewAutoDrawer_SetActive(ViewAutoDrawer *that, // IN - gboolean active) // IN -{ - g_return_if_fail(VIEW_IS_AUTODRAWER(that)); - - that->priv->active = active; - - /* This change happens programmatically. Always react to it immediately. */ - ViewAutoDrawerUpdate(that, TRUE); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawer_SetPinned -- - * - * Set whether the AutoDrawer is pinned or not. When pinned, the - * AutoDrawer will stay open regardless of the state of any other inputs. - * - * Results: - * None - * - * Side effects: - * Drawer state is updated. - * - *----------------------------------------------------------------------------- - */ - -void -ViewAutoDrawer_SetPinned(ViewAutoDrawer *that, // IN - gboolean pinned) // IN -{ - g_return_if_fail(VIEW_IS_AUTODRAWER(that)); - - that->priv->pinned = pinned; - - /* - * This change happens in response to user input. By default, give the user - * some time to correct his input before reacting to the change. - */ - ViewAutoDrawerUpdate(that, FALSE); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawer_SetFill -- - * - * Set whether the Over widget of the AutoDrawer should fill the full - * width of the AutoDrawer or just occupy the minimum space it needs. - * A value of TRUE overrides offset settings. - * - * Results: - * None - * - * Side effects: - * Drawer state is updated. - * - *----------------------------------------------------------------------------- - */ - -void -ViewAutoDrawer_SetFill(ViewAutoDrawer *that, // IN - gboolean fill) // IN -{ - g_return_if_fail(VIEW_IS_AUTODRAWER(that)); - - that->priv->fill = fill; - ViewAutoDrawerRefreshPacking(that); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewAutoDrawer_SetOffset -- - * - * Set the drawer's X offset, or distance in pixels from the left side. - * If offset is -1, the drawer will be centered. If fill has been set - * TRUE by SetFill, these settings will have no effect. - * - * Results: - * None - * - * Side effects: - * Drawer state is updated. - * - *----------------------------------------------------------------------------- - */ - -void -ViewAutoDrawer_SetOffset(ViewAutoDrawer *that, // IN - gint offset) // IN -{ - g_return_if_fail(VIEW_IS_AUTODRAWER(that)); - - that->priv->offset = offset; - ViewAutoDrawerRefreshPacking(that); -} diff -Nru vinagre-2.26.1/src/view/autoDrawer.h vinagre-2.29.1/src/view/autoDrawer.h --- vinagre-2.26.1/src/view/autoDrawer.h 2008-06-03 00:20:01.000000000 +0100 +++ vinagre-2.29.1/src/view/autoDrawer.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -/* ************************************************************************* - * Copyright (c) 2005 VMware Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * *************************************************************************/ - -/* - * autoDrawer.h -- - * - * Declarations for the ViewAutoDrawer GTK+ widget. - */ - - -#ifndef LIBVIEW_AUTODRAWER_H -#define LIBVIEW_AUTODRAWER_H - - -#include "drawer.h" - - -#define VIEW_TYPE_AUTODRAWER (ViewAutoDrawer_GetType()) -#define VIEW_AUTODRAWER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VIEW_TYPE_AUTODRAWER, ViewAutoDrawer)) -#define VIEW_AUTODRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VIEW_TYPE_AUTODRAWER, ViewAutoDrawerClass)) -#define VIEW_IS_AUTODRAWER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VIEW_TYPE_AUTODRAWER)) -#define VIEW_IS_AUTODRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VIEW_TYPE_AUTODRAWER)) -#define VIEW_AUTODRAWER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VIEW_TYPE_AUTODRAWER, ViewAutoDrawerClass)) - -typedef struct _ViewAutoDrawerPrivate ViewAutoDrawerPrivate; - -typedef struct _ViewAutoDrawer { - /* Must come first. */ - ViewDrawer parent; - - /* Private. */ - ViewAutoDrawerPrivate *priv; -} ViewAutoDrawer; - -typedef struct _ViewAutoDrawerClass { - /* Must come first. */ - ViewDrawerClass parent; - - /* Padding for future expansion */ - void (*_view_reserved0)(void); - void (*_view_reserved1)(void); - void (*_view_reserved2)(void); - void (*_view_reserved3)(void); -} ViewAutoDrawerClass; - - -G_BEGIN_DECLS - - -GType ViewAutoDrawer_GetType(void); - -GtkWidget *ViewAutoDrawer_New(void); - -void ViewAutoDrawer_SetSlideDelay(ViewAutoDrawer *that, guint delay); -void ViewAutoDrawer_SetOverlapPixels(ViewAutoDrawer *that, guint overlapPixels); -void ViewAutoDrawer_SetNoOverlapPixels(ViewAutoDrawer *that, guint noOverlapPixels); - -void ViewAutoDrawer_SetActive(ViewAutoDrawer *that, gboolean active); - -void ViewAutoDrawer_SetPinned(ViewAutoDrawer *that, gboolean pinned); - -void ViewAutoDrawer_SetFill(ViewAutoDrawer *that, gboolean fill); - -void ViewAutoDrawer_SetOffset(ViewAutoDrawer *that, gint offset); - -G_END_DECLS - - -#endif /* LIBVIEW_AUTODRAWER_H */ diff -Nru vinagre-2.26.1/src/view/drawer.c vinagre-2.29.1/src/view/drawer.c --- vinagre-2.26.1/src/view/drawer.c 2008-06-03 00:20:09.000000000 +0100 +++ vinagre-2.29.1/src/view/drawer.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,332 +0,0 @@ -/* ************************************************************************* - * Copyright (c) 2005 VMware, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * *************************************************************************/ - -/* - * drawer.c - - * - * Implementation of a GTK+ drawer, i.e. a widget that opens and closes by - * sliding smoothly, at constant speed, over another one. - */ - - -#include "drawer.h" - - -struct _ViewDrawerPrivate -{ - unsigned int period; - double step; - double goal; - struct { - gboolean pending; - guint id; - } timer; -}; - -#define VIEW_DRAWER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), VIEW_TYPE_DRAWER, ViewDrawerPrivate)) - -/* The unaltered parent class. */ -static ViewOvBoxClass *parentClass; - - -/* - *----------------------------------------------------------------------------- - * - * ViewDrawerInit -- - * - * Initialize a ViewDrawer. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewDrawerInit(GTypeInstance *instance, // IN - gpointer klass) // Unused -{ - ViewDrawer *that; - - that = VIEW_DRAWER(instance); - that->priv = VIEW_DRAWER_GET_PRIVATE(that); - - that->priv->period = 10; - that->priv->step = 0.2; - that->priv->timer.pending = FALSE; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewDrawerFinalize -- - * - * "finalize" method of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewDrawerFinalize(GObject *object) // IN -{ - ViewDrawer *that; - ViewDrawerPrivate *priv; - - that = VIEW_DRAWER(object); - priv = that->priv; - - if (priv->timer.pending) { - g_source_remove(priv->timer.id); - priv->timer.pending = FALSE; - } - - G_OBJECT_CLASS(parentClass)->finalize(object); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewDrawerClassInit -- - * - * Initialize the ViewDrawerClass. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewDrawerClassInit(gpointer klass) // IN -{ - GObjectClass *objectClass = G_OBJECT_CLASS(klass); - - parentClass = g_type_class_peek_parent(klass); - - objectClass->finalize = ViewDrawerFinalize; - - g_type_class_add_private(objectClass, sizeof(ViewDrawerPrivate)); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewDrawer_GetType -- - * - * Get the (memoized) GType of the ViewDrawer GTK+ object. - * - * Results: - * The GType - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -GType -ViewDrawer_GetType(void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo info = { - sizeof (ViewDrawerClass), - NULL, /* BaseInit */ - NULL, /* BaseFinalize */ - (GClassInitFunc)ViewDrawerClassInit, - NULL, - NULL, /* Class Data */ - sizeof (ViewDrawer), - 0, /* n_preallocs */ - (GInstanceInitFunc)ViewDrawerInit, - }; - - type = g_type_register_static(VIEW_TYPE_OV_BOX, "ViewDrawer", &info, 0); - } - - return type; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewDrawer_New -- - * - * Create a new ViewDrawer GTK+ widget. - * - * Results: - * The widget - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -GtkWidget * -ViewDrawer_New(void) -{ - ViewDrawer *that; - - that = VIEW_DRAWER(g_object_new(VIEW_TYPE_DRAWER, NULL)); - - return GTK_WIDGET(that); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewDrawerOnTimer -- - * - * Timer callback of a ViewDrawer. If we have reached the goal, deschedule - * the timer. Otherwise make progress towards the goal, and keep the timer - * scheduled. - * - * Results: - * TRUE if the timer must be rescheduled. - * FALSE if the timer must not be rescheduled. - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static gint -ViewDrawerOnTimer(gpointer data) // IN -{ - ViewDrawer *that; - ViewDrawerPrivate *priv; - double fraction; - - that = VIEW_DRAWER(data); - priv = that->priv; - - fraction = ViewOvBox_GetFraction(VIEW_OV_BOX(that)); - /* - * Comparing double values with '==' is most of the time a bad idea, due to - * the inexact representation of values in binary (see - * http://www2.hursley.ibm.com/decimal/decifaq1.html and http://boost.org/libs/test/doc/components/test_tools/floating_point_comparison.html). - * But in this particular case it is legitimate. --hpreg - */ - if (priv->goal == fraction) { - return priv->timer.pending = FALSE; - } - - ViewOvBox_SetFraction(VIEW_OV_BOX(that), - priv->goal > fraction - ? MIN(fraction + priv->step, priv->goal) - : MAX(fraction - priv->step, priv->goal)); - return TRUE; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewDrawer_SetSpeed -- - * - * Set the 'period' (in ms.) and 'step' properties of a ViewDrawer, which - * determine the speed and smoothness of the drawer's motion. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -void -ViewDrawer_SetSpeed(ViewDrawer *that, // IN - unsigned int period, // IN - double step) // IN -{ - ViewDrawerPrivate *priv; - - g_return_if_fail(that != NULL); - - priv = that->priv; - - priv->period = period; - if (priv->timer.pending) { - g_source_remove(priv->timer.id); - priv->timer.id = g_timeout_add(priv->period, ViewDrawerOnTimer, that); - } - priv->step = step; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewDrawer_SetGoal -- - * - * Set the 'goal' property of a ViewDrawer, i.e. how much the drawer should - * be opened when it is done sliding. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -void -ViewDrawer_SetGoal(ViewDrawer *that, // IN - double goal) // IN -{ - ViewDrawerPrivate *priv; - - g_return_if_fail(that != NULL); - g_return_if_fail(goal >= 0 && goal <= 1); - - priv = that->priv; - - priv->goal = goal; - if (priv->timer.pending == FALSE) { - priv->timer.id = g_timeout_add(priv->period, ViewDrawerOnTimer, that); - priv->timer.pending = TRUE; - } -} diff -Nru vinagre-2.26.1/src/view/drawer.h vinagre-2.29.1/src/view/drawer.h --- vinagre-2.26.1/src/view/drawer.h 2008-06-03 00:20:19.000000000 +0100 +++ vinagre-2.29.1/src/view/drawer.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -/* ************************************************************************* - * Copyright (c) 2005 VMware, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * *************************************************************************/ - -/* - * drawer.h -- - * - * Declarations for the ViewDrawer GTK+ widget. - */ - - -#ifndef LIBVIEW_DRAWER_H -#define LIBVIEW_DRAWER_H - - -#include "ovBox.h" - - -#define VIEW_TYPE_DRAWER (ViewDrawer_GetType()) -#define VIEW_DRAWER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VIEW_TYPE_DRAWER, ViewDrawer)) -#define VIEW_DRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VIEW_TYPE_DRAWER, ViewDrawerClass)) -#define VIEW_IS_DRAWER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VIEW_TYPE_DRAWER)) -#define VIEW_IS_DRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VIEW_TYPE_DRAWER)) -#define VIEW_DRAWER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VIEW_TYPE_DRAWER, ViewDrawerClass)) - -typedef struct _ViewDrawerPrivate ViewDrawerPrivate; - -typedef struct _ViewDrawer { - /* Must come first. */ - ViewOvBox parent; - - /* Private. */ - ViewDrawerPrivate *priv; -} ViewDrawer; - - -typedef struct _ViewDrawerClass { - /* Must come first. */ - ViewOvBoxClass parent; - - /* Padding for future expansion */ - void (*_view_reserved0)(void); - void (*_view_reserved1)(void); - void (*_view_reserved2)(void); - void (*_view_reserved3)(void); -} ViewDrawerClass; - - -G_BEGIN_DECLS - - -GType ViewDrawer_GetType(void); - -GtkWidget *ViewDrawer_New(void); - -void ViewDrawer_SetSpeed(ViewDrawer *that, unsigned int period, double step); -void ViewDrawer_SetGoal(ViewDrawer *that, double fraction); - - -G_END_DECLS - - -#endif /* LIBVIEW_DRAWER_H */ diff -Nru vinagre-2.26.1/src/view/Makefile.am vinagre-2.29.1/src/view/Makefile.am --- vinagre-2.26.1/src/view/Makefile.am 2008-05-28 18:42:07.000000000 +0100 +++ vinagre-2.29.1/src/view/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -NULL = - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - $(VINAGRE_CFLAGS) \ - $(NULL) - -noinst_LTLIBRARIES = libview.la - -libview_la_SOURCES = \ - autoDrawer.h autoDrawer.c \ - drawer.h drawer.c \ - ovBox.h ovBox.c \ - $(NULL) diff -Nru vinagre-2.26.1/src/view/Makefile.in vinagre-2.29.1/src/view/Makefile.in --- vinagre-2.26.1/src/view/Makefile.in 2009-04-13 14:35:37.000000000 +0100 +++ vinagre-2.29.1/src/view/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,511 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/view -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libview_la_LIBADD = -am__objects_1 = -am_libview_la_OBJECTS = autoDrawer.lo drawer.lo ovBox.lo \ - $(am__objects_1) -libview_la_OBJECTS = $(am_libview_la_OBJECTS) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libview_la_SOURCES) -DIST_SOURCES = $(libview_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -APPLET_CFLAGS = @APPLET_CFLAGS@ -APPLET_LIBS = @APPLET_LIBS@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AVAHI_CFLAGS = @AVAHI_CFLAGS@ -AVAHI_LIBS = @AVAHI_LIBS@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -HELP_DIR = @HELP_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -REBUILD = @REBUILD@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ -VINAGRE_LIBS = @VINAGRE_LIBS@ -WARN_CFLAGS = @WARN_CFLAGS@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -NULL = -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - $(VINAGRE_CFLAGS) \ - $(NULL) - -noinst_LTLIBRARIES = libview.la -libview_la_SOURCES = \ - autoDrawer.h autoDrawer.c \ - drawer.h drawer.c \ - ovBox.h ovBox.c \ - $(NULL) - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/view/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/view/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libview.la: $(libview_la_OBJECTS) $(libview_la_DEPENDENCIES) - $(LINK) $(libview_la_OBJECTS) $(libview_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autoDrawer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovBox.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru vinagre-2.26.1/src/view/ovBox.c vinagre-2.29.1/src/view/ovBox.c --- vinagre-2.26.1/src/view/ovBox.c 2008-06-03 00:20:30.000000000 +0100 +++ vinagre-2.29.1/src/view/ovBox.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,902 +0,0 @@ -/* ************************************************************************* - * Copyright (c) 2005 VMware, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * *************************************************************************/ - -/* - * ovBox.c -- - * - * Implementation of a GTK+ overlapping box. Allows you to display and - * quickly move a child that overlaps another child. - * - * Implementation notes - * -------------------- - * - * Changing 'fraction' is fast (we just move the 'overWin' X window, which - * ultimately copies a rectangle on the X server side), and does not - * flicker (the 'under' and 'over' GTK children are not re-drawn, except - * for parts of them that become exposed). - * - * o Initially, we thought it could be done with only 2 X windows - * - * Layout Hierarchy - * ------ --------- - * - * /- overWin --\ underWin - * | | overWin - * /-+- underWin -+-\ - * | | | | - * | \------------/ | - * | | - * \----------------/ - * - * But the 'under' GTK child could create other X windows inside - * 'underWin', which makes it impossible to guarantee that 'overWin' - * will stay stacked on top. - * - * o So we are forced to use 3 X windows - * - * Layout Hierarchy - * ------ --------- - * - * /- overWin --\ window - * | | overWin - * /---+- window ---+---\ underWin - * | | | | - * | /-+- underWin -+-\ | - * | | | | | | - * | | \------------/ | | - * | | | | - * | \----------------/ | - * | | - * \--------------------/ - * - * --hpreg - */ - - -#include "ovBox.h" - - -struct _ViewOvBoxPrivate -{ - GdkWindow *underWin; - GtkWidget *under; - GdkWindow *overWin; - GtkWidget *over; - GtkRequisition overR; - unsigned int min; - double fraction; -}; - -#define VIEW_OV_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), VIEW_TYPE_OV_BOX, ViewOvBoxPrivate)) - -/* The unaltered parent class. */ -static GtkBoxClass *parentClass; - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxInit -- - * - * Initialize a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxInit(GTypeInstance *instance, // IN - gpointer klass) // Unused -{ - ViewOvBox *that; - ViewOvBoxPrivate *priv; - - that = VIEW_OV_BOX(instance); - that->priv = VIEW_OV_BOX_GET_PRIVATE(that); - priv = that->priv; - - GTK_WIDGET_UNSET_FLAGS(that, GTK_NO_WINDOW); - - priv->underWin = NULL; - priv->under = NULL; - priv->overWin = NULL; - priv->over = NULL; - priv->overR.height = -1; - priv->overR.width = -1; - priv->min = 0; - priv->fraction = 0; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxMap -- - * - * "map" method of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxMap(GtkWidget *widget) // IN -{ - gdk_window_show(widget->window); - GTK_WIDGET_CLASS(parentClass)->map(widget); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxUnmap -- - * - * "unmap" method of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxUnmap(GtkWidget *widget) // IN -{ - gdk_window_hide(widget->window); - GTK_WIDGET_CLASS(parentClass)->unmap(widget); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxGetActualMin -- - * - * Retrieve the actual 'min' value, i.e. a value that is guaranteed not to - * exceed the height of the 'over' child. - * - * Results: - * The actual 'min' value. - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static inline unsigned int -ViewOvBoxGetActualMin(ViewOvBox *that) // IN -{ - return MIN(that->priv->min, that->priv->overR.height); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxGetUnderGeometry -- - * - * Retrieve the geometry to apply to 'that->underWin'. - * - * Results: - * The geometry - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxGetUnderGeometry(ViewOvBox *that, // IN - int *x, // OUT - int *y, // OUT - int *width, // OUT - int *height) // OUT -{ - unsigned int min; - GtkAllocation *allocation; - - min = ViewOvBoxGetActualMin(that); - allocation = >K_WIDGET(that)->allocation; - - *x = 0; - *y = min; - *width = allocation->width; - *height = allocation->height - min; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxGetOverGeometry -- - * - * Retrieve the geometry to apply to 'that->overWin'. - * - * Results: - * The geometry - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxGetOverGeometry(ViewOvBox *that, // IN - int *x, // OUT - int *y, // OUT - int *width, // OUT - int *height) // OUT -{ - ViewOvBoxPrivate *priv; - gboolean expand; - gboolean fill; - guint padding; - unsigned int boxWidth; - - priv = that->priv; - - if (priv->over) { - /* - * When a child's expand or fill property changes, GtkBox queues - * a resize for the child. - */ - gtk_container_child_get(GTK_CONTAINER(that), priv->over, - "expand", &expand, - "fill", &fill, - "padding", &padding, - NULL); - } else { - /* Default values used by GtkBox. */ - expand = TRUE; - fill = TRUE; - padding = 0; - } - - boxWidth = GTK_WIDGET(that)->allocation.width; - if (!expand) { - *width = MIN(priv->overR.width, boxWidth - padding); - *x = padding; - } else if (!fill) { - *width = MIN(priv->overR.width, boxWidth); - *x = (boxWidth - *width) / 2; - } else { - *width = boxWidth; - *x = 0; - } - - *y = (priv->overR.height - ViewOvBoxGetActualMin(that)) - * (priv->fraction - 1); - *height = priv->overR.height; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxSetBackground -- - * - * Set the background color of the 'underWin' and 'overWin' X windows. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxSetBackground(ViewOvBox *that) // IN -{ - GtkWidget *widget; - - widget = GTK_WIDGET(that); - gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL); - gtk_style_set_background(widget->style, that->priv->underWin, GTK_STATE_NORMAL); - gtk_style_set_background(widget->style, that->priv->overWin, GTK_STATE_NORMAL); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxRealize -- - * - * "realize" method of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxRealize(GtkWidget *widget) // IN -{ - ViewOvBox *that; - ViewOvBoxPrivate *priv; - GdkWindowAttr attributes; - gint mask; - GtkAllocation *allocation; - - GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED); - - that = VIEW_OV_BOX(widget); - priv = that->priv; - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual(widget); - attributes.colormap = gtk_widget_get_colormap(widget); - attributes.event_mask = gtk_widget_get_events(widget) | GDK_EXPOSURE_MASK; - mask = GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_X | GDK_WA_Y; - - allocation = &widget->allocation; - attributes.x = allocation->x; - attributes.y = allocation->y; - attributes.width = allocation->width; - attributes.height = allocation->height; - widget->window = gdk_window_new(gtk_widget_get_parent_window(widget), - &attributes, mask); - gdk_window_set_user_data(widget->window, that); - widget->style = gtk_style_attach(widget->style, widget->window); - - /* - * The order in which we create the children X window matters: the child - * created last is stacked on top. --hpreg - */ - - ViewOvBoxGetUnderGeometry(that, &attributes.x, &attributes.y, - &attributes.width, &attributes.height); - priv->underWin = gdk_window_new(widget->window, &attributes, mask); - gdk_window_set_user_data(priv->underWin, that); - if (priv->under) { - gtk_widget_set_parent_window(priv->under, priv->underWin); - } - gdk_window_show(priv->underWin); - - ViewOvBoxGetOverGeometry(that, &attributes.x, &attributes.y, - &attributes.width, &attributes.height); - priv->overWin = gdk_window_new(widget->window, &attributes, mask); - gdk_window_set_user_data(priv->overWin, that); - if (priv->over) { - gtk_widget_set_parent_window(priv->over, priv->overWin); - } - gdk_window_show(priv->overWin); - - ViewOvBoxSetBackground(that); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxUnrealize -- - * - * "unrealize" method of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxUnrealize(GtkWidget *widget) // IN -{ - ViewOvBox *that; - ViewOvBoxPrivate *priv; - - that = VIEW_OV_BOX(widget); - priv = that->priv; - - /* - * Unrealize the parent before destroying the windows so that we end up - * unrealizing all the child widgets before destroying the child windows, - * giving them a chance to reparent their windows before we clobber them. - */ - GTK_WIDGET_CLASS(parentClass)->unrealize(widget); - - - gdk_window_set_user_data(priv->underWin, NULL); - gdk_window_destroy(priv->underWin); - priv->underWin = NULL; - - gdk_window_set_user_data(priv->overWin, NULL); - gdk_window_destroy(priv->overWin); - priv->overWin = NULL; - -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxSizeRequest -- - * - * "size_request" method of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxSizeRequest(GtkWidget *widget, // IN - GtkRequisition *requisition) // OUT -{ - ViewOvBox *that; - ViewOvBoxPrivate *priv; - GtkRequisition underR; - gboolean expand; - gboolean fill; - guint padding; - unsigned int min; - - that = VIEW_OV_BOX(widget); - priv = that->priv; - - gtk_widget_size_request(priv->under, &underR); - gtk_widget_size_request(priv->over, &priv->overR); - - gtk_container_child_get(GTK_CONTAINER(that), priv->over, - "expand", &expand, - "fill", &fill, - "padding", &padding, - NULL); - requisition->width = MAX(underR.width, - priv->overR.width + ((expand || fill) ? 0 : padding)); - min = ViewOvBoxGetActualMin(that); - requisition->height = MAX(underR.height + min, priv->overR.height); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxSizeAllocate -- - * - * "size_allocate" method of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxSizeAllocate(GtkWidget *widget, // IN - GtkAllocation *allocation) // IN -{ - ViewOvBox *that; - ViewOvBoxPrivate *priv; - GtkAllocation under; - GtkAllocation over; - - widget->allocation = *allocation; - - that = VIEW_OV_BOX(widget); - priv = that->priv; - - ViewOvBoxGetUnderGeometry(that, &under.x, &under.y, &under.width, - &under.height); - ViewOvBoxGetOverGeometry(that, &over.x, &over.y, &over.width, &over.height); - - if (GTK_WIDGET_REALIZED(widget)) { - gdk_window_move_resize(widget->window, allocation->x, allocation->y, - allocation->width, allocation->height); - gdk_window_move_resize(priv->underWin, under.x, under.y, under.width, - under.height); - gdk_window_move_resize(priv->overWin, over.x, over.y, over.width, - over.height); - } - - under.x = 0; - under.y = 0; - gtk_widget_size_allocate(priv->under, &under); - over.x = 0; - over.y = 0; - gtk_widget_size_allocate(priv->over, &over); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxStyleSet -- - * - * "style_set" method of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxStyleSet(GtkWidget *widget, // IN - GtkStyle *previousStyle) // IN: Unused -{ - ViewOvBox *that; - - that = VIEW_OV_BOX(widget); - - if (GTK_WIDGET_REALIZED(widget)) { - ViewOvBoxSetBackground(that); - } - - GTK_WIDGET_CLASS(parentClass)->style_set(widget, previousStyle); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxSetChild -- - * - * Set a child of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxSetChild(ViewOvBox *that, // IN - GtkWidget **child, // IN - GdkWindow *childWin, // IN - GtkWidget *widget) // IN -{ - GtkWidget *oldChild = *child; - - if (oldChild) { - g_object_ref(oldChild); - gtk_container_remove(GTK_CONTAINER(that), oldChild); - } - - *child = widget; - if (*child) { - gtk_widget_set_parent_window(widget, childWin); - gtk_container_add(GTK_CONTAINER(that), *child); - } - - if (oldChild) { - g_object_unref(oldChild); - } -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxSetOver -- - * - * Base implementation of ViewOvBox_SetOver. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxSetOver(ViewOvBox *that, // IN - GtkWidget *widget) // IN -{ - ViewOvBoxSetChild(that, &that->priv->over, that->priv->overWin, widget); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBoxClassInit -- - * - * Initialize the ViewOvBoxClass. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -static void -ViewOvBoxClassInit(ViewOvBoxClass *klass) // IN -{ - GObjectClass *objectClass; - GtkWidgetClass *widgetClass; - - objectClass = G_OBJECT_CLASS(klass); - widgetClass = GTK_WIDGET_CLASS(klass); - - widgetClass->map = ViewOvBoxMap; - widgetClass->unmap = ViewOvBoxUnmap; - widgetClass->realize = ViewOvBoxRealize; - widgetClass->unrealize = ViewOvBoxUnrealize; - widgetClass->size_request = ViewOvBoxSizeRequest; - widgetClass->size_allocate = ViewOvBoxSizeAllocate; - widgetClass->style_set = ViewOvBoxStyleSet; - - klass->set_over = ViewOvBoxSetOver; - - parentClass = g_type_class_peek_parent(klass); - - g_type_class_add_private(objectClass, sizeof(ViewOvBoxPrivate)); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBox_GetType -- - * - * Get the (memoized) GType of the ViewOvBox GTK+ object. - * - * Results: - * The GType - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -GType -ViewOvBox_GetType(void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo info = { - sizeof (ViewOvBoxClass), - NULL, /* BaseInit */ - NULL, /* BaseFinalize */ - (GClassInitFunc)ViewOvBoxClassInit, - NULL, - NULL, /* Class Data */ - sizeof (ViewOvBox), - 0, /* n_preallocs */ - (GInstanceInitFunc)ViewOvBoxInit, - }; - - type = g_type_register_static(GTK_TYPE_BOX, "ViewOvBox", &info, 0); - } - - return type; -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBox_New -- - * - * Create a new ViewOvBox GTK+ widget. - * - * Results: - * The widget - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -GtkWidget * -ViewOvBox_New(void) -{ - ViewOvBox *that; - - that = VIEW_OV_BOX(g_object_new(VIEW_TYPE_OV_BOX, NULL)); - - return GTK_WIDGET(that); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBox_SetUnder -- - * - * Set the under widget of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -void -ViewOvBox_SetUnder(ViewOvBox *that, // IN - GtkWidget *widget) // IN -{ - g_return_if_fail(that != NULL); - - ViewOvBoxSetChild(that, &that->priv->under, that->priv->underWin, widget); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBox_SetOver -- - * - * Set the over widget of a ViewOvBox. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -void -ViewOvBox_SetOver(ViewOvBox *that, // IN - GtkWidget *widget) // IN -{ - g_return_if_fail(that != NULL); - - VIEW_OV_BOX_GET_CLASS(that)->set_over(that, widget); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBox_SetMin -- - * - * Set the 'min' property of a ViewOvBox, i.e. the number of pixel of the - * 'over' child that should always be displayed without overlapping on the - * 'under' child. - * - * Using a value of -1 displays the 'over' child entirely. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -void -ViewOvBox_SetMin(ViewOvBox *that, // IN - unsigned int min) // IN -{ - g_return_if_fail(that != NULL); - - that->priv->min = min; - gtk_widget_queue_resize(GTK_WIDGET(that)); -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBox_SetFraction -- - * - * Set the 'fraction' property of a ViewOvBox, i.e. how much of the 'over' - * child should overlap on the 'under' child. - * - * Results: - * None - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -void -ViewOvBox_SetFraction(ViewOvBox *that, // IN - double fraction) // IN -{ - g_return_if_fail(that != NULL); - g_return_if_fail(fraction >=0 && fraction <= 1); - - that->priv->fraction = fraction; - if (GTK_WIDGET_REALIZED(that)) { - int x; - int y; - int width; - int height; - - ViewOvBoxGetOverGeometry(that, &x, &y, &width, &height); - gdk_window_move(that->priv->overWin, x, y); - } -} - - -/* - *----------------------------------------------------------------------------- - * - * ViewOvBox_GetFraction -- - * - * Retrieve the 'fraction' property of a ViewOvBox. - * - * Results: - * The value - * - * Side effects: - * None - * - *----------------------------------------------------------------------------- - */ - -double -ViewOvBox_GetFraction(ViewOvBox *that) -{ - g_return_val_if_fail(that != NULL, 0); - - return that->priv->fraction; -} diff -Nru vinagre-2.26.1/src/view/ovBox.h vinagre-2.29.1/src/view/ovBox.h --- vinagre-2.26.1/src/view/ovBox.h 2008-05-28 17:57:19.000000000 +0100 +++ vinagre-2.29.1/src/view/ovBox.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -/* ************************************************************************* - * Copyright (c) 2005 VMware, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * *************************************************************************/ - -/* - * ovBox.h -- - * - * Declarations for the ViewOvBox GTK+ widget. - */ - - -#ifndef LIBVIEW_OVBOX_H -#define LIBVIEW_OVBOX_H - - -#include - - -#define VIEW_TYPE_OV_BOX (ViewOvBox_GetType()) -#define VIEW_OV_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VIEW_TYPE_OV_BOX, ViewOvBox)) -#define VIEW_OV_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VIEW_TYPE_OV_BOX, ViewOvBoxClass)) -#define VIEW_IS_OV_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VIEW_TYPE_OV_BOX)) -#define VIEW_IS_OV_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VIEW_TYPE_OV_BOX)) -#define VIEW_OV_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VIEW_TYPE_OV_BOX, ViewOvBoxClass)) - -typedef struct _ViewOvBoxPrivate ViewOvBoxPrivate; - -typedef struct _ViewOvBox { - /* Must come first. */ - GtkBox parent; - - /* Private. */ - ViewOvBoxPrivate *priv; -} ViewOvBox; - - -typedef struct _ViewOvBoxClass { - /* Must come first. */ - GtkBoxClass parent; - - /* Virtual methods. */ - void (* set_over)(ViewOvBox *ovBox, GtkWidget *widget); - - /* Padding for future expansion */ - void (*_view_reserved0)(void); - void (*_view_reserved1)(void); - void (*_view_reserved2)(void); - void (*_view_reserved3)(void); -} ViewOvBoxClass; - - -G_BEGIN_DECLS - - -GType -ViewOvBox_GetType(void); - -GtkWidget * -ViewOvBox_New(void); - -void -ViewOvBox_SetUnder(ViewOvBox *that, - GtkWidget *widget); - -void -ViewOvBox_SetOver(ViewOvBox *that, - GtkWidget *widget); - -void -ViewOvBox_SetMin(ViewOvBox *that, - unsigned int min); - -void -ViewOvBox_SetFraction(ViewOvBox *that, - double fraction); - -double -ViewOvBox_GetFraction(ViewOvBox *that); - - -G_END_DECLS - - -#endif /* LIBVIEW_OVBOX_H */ diff -Nru vinagre-2.26.1/src/vinagre-app.c vinagre-2.29.1/src/vinagre-app.c --- vinagre-2.26.1/src/vinagre-app.c 2008-07-26 13:09:45.000000000 +0100 +++ vinagre-2.29.1/src/vinagre-app.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,320 +0,0 @@ -/* - * vinagre-app.c - * This file is part of vinagre - * - * Copyright (C) 2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - -#include "vinagre-app.h" -#include "vinagre-utils.h" - -#define VINAGRE_APP_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_APP, VinagreAppPrivate)) - - -struct _VinagreAppPrivate -{ - GList *windows; - VinagreWindow *active_window; -}; - -G_DEFINE_TYPE(VinagreApp, vinagre_app, G_TYPE_OBJECT) - -static void -vinagre_app_finalize (GObject *object) -{ - VinagreApp *app = VINAGRE_APP (object); - - g_list_free (app->priv->windows); - - G_OBJECT_CLASS (vinagre_app_parent_class)->finalize (object); -} - -static void -vinagre_app_class_init (VinagreAppClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = vinagre_app_finalize; - - g_type_class_add_private (object_class, sizeof(VinagreAppPrivate)); -} - -static gchar * -get_accel_file (void) -{ - const gchar *home; - - home = g_get_user_config_dir (); - - if (home) - return g_build_filename (home, - "vinagre", - "accels", - NULL); - return NULL; -} - -static void -load_accels (void) -{ - gchar *filename; - - filename = get_accel_file (); - if (!filename) - return; - - gtk_accel_map_load (filename); - g_free (filename); -} - -static void -save_accels (void) -{ - gchar *filename; - - filename = get_accel_file (); - if (!filename) - return; - - gtk_accel_map_save (filename); - g_free (filename); -} - -static void -vinagre_app_init (VinagreApp *app) -{ - app->priv = VINAGRE_APP_GET_PRIVATE (app); - app->priv->windows = NULL; - app->priv->active_window = NULL; - - load_accels (); -} - -static void -app_weak_notify (gpointer data, - GObject *where_the_app_was) -{ - gtk_main_quit (); -} - -VinagreApp * -vinagre_app_get_default (void) -{ - static VinagreApp *app = NULL; - - if (G_LIKELY (app)) - return app; - - app = VINAGRE_APP (g_object_new (VINAGRE_TYPE_APP, NULL)); - - g_object_add_weak_pointer (G_OBJECT (app), - (gpointer) &app); - g_object_weak_ref (G_OBJECT (app), - app_weak_notify, - NULL); - - return app; -} - -static gboolean -window_focus_in_event (VinagreWindow *window, - GdkEventFocus *event, - VinagreApp *app) -{ - /* updates active_view and active_child when a new toplevel receives focus */ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), FALSE); - - app->priv->active_window = window; - - return FALSE; -} - -static void -window_destroy (VinagreWindow *window, - VinagreApp *app) -{ - app->priv->windows = g_list_remove (app->priv->windows, - window); - - if (window == app->priv->active_window) - app->priv->active_window = app->priv->windows != NULL ? - app->priv->windows->data : NULL; - - if (app->priv->windows == NULL) - { - save_accels (); - g_object_unref (app); - } -} - -VinagreWindow * -vinagre_app_create_window (VinagreApp *app, GdkScreen *screen) -{ - VinagreWindow *window; - - /* - * We need to be careful here, there is a race condition: - * when another vinagre is launched it checks active_window, - * so we must do our best to ensure that active_window - * is never NULL when at least a window exists. - */ - if (app->priv->windows == NULL) - app->priv->active_window = window = vinagre_window_new (); - else - window = vinagre_window_new (); - - app->priv->windows = g_list_prepend (app->priv->windows, - window); - - g_signal_connect (window, - "focus_in_event", - G_CALLBACK (window_focus_in_event), - app); - g_signal_connect (window, - "destroy", - G_CALLBACK (window_destroy), - app); - - if (screen != NULL) - gtk_window_set_screen (GTK_WINDOW (window), screen); - - return window; -} - -const GList * -vinagre_app_get_windows (VinagreApp *app) -{ - g_return_val_if_fail (VINAGRE_IS_APP (app), NULL); - - return app->priv->windows; -} - -VinagreWindow * -vinagre_app_get_active_window (VinagreApp *app) -{ - g_return_val_if_fail (VINAGRE_IS_APP (app), NULL); - - /* make sure our active window is always realized: - * this is needed on startup if we launch two vinagre fast - * enough that the second instance comes up before the - * first one shows its window. - */ - - if (!GTK_WIDGET_REALIZED (GTK_WIDGET (app->priv->active_window))) - gtk_widget_realize (GTK_WIDGET (app->priv->active_window)); - - return app->priv->active_window; -} - -static gboolean -is_in_viewport (VinagreWindow *window, - GdkScreen *screen, - gint workspace, - gint viewport_x, - gint viewport_y) -{ - GdkScreen *s; - GdkDisplay *display; - const gchar *cur_name; - const gchar *name; - gint cur_n; - gint n; - gint ws; - gint sc_width, sc_height; - gint x, y, width, height; - gint vp_x, vp_y; - - /* Check for screen and display match */ - display = gdk_screen_get_display (screen); - cur_name = gdk_display_get_name (display); - cur_n = gdk_screen_get_number (screen); - - s = gtk_window_get_screen (GTK_WINDOW (window)); - display = gdk_screen_get_display (s); - name = gdk_display_get_name (display); - n = gdk_screen_get_number (s); - - if (strcmp (cur_name, name) != 0 || cur_n != n) - return FALSE; - - /* Check for workspace match */ - ws = vinagre_utils_get_window_workspace (GTK_WINDOW (window)); - if (ws != workspace && ws != VINAGRE_ALL_WORKSPACES) - return FALSE; - - /* Check for viewport match */ - gdk_window_get_position (GTK_WIDGET (window)->window, &x, &y); - gdk_drawable_get_size (GTK_WIDGET (window)->window, &width, &height); - vinagre_utils_get_current_viewport (screen, &vp_x, &vp_y); - x += vp_x; - y += vp_y; - - sc_width = gdk_screen_get_width (screen); - sc_height = gdk_screen_get_height (screen); - - return x + width * .25 >= viewport_x && - x + width * .75 < viewport_x + sc_width && - y >= viewport_y && - y + height < viewport_y + sc_height; -} - -VinagreWindow * -vinagre_app_get_window_in_viewport (VinagreApp *app, - GdkScreen *screen, - gint workspace, - gint viewport_x, - gint viewport_y) -{ - VinagreWindow *window; - GList *l; - - g_return_val_if_fail (VINAGRE_IS_APP (app), NULL); - - /* first try if the active window */ - window = app->priv->active_window; - - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - if (is_in_viewport (window, screen, workspace, viewport_x, viewport_y)) - return window; - - /* otherwise try to see if there is a window on this workspace */ - for (l = app->priv->windows; l != NULL; l = l->next) - { - window = l->data; - - if (is_in_viewport (window, screen, workspace, viewport_x, viewport_y)) - return window; - } - - /* no window on this workspace... create a new one */ - return vinagre_app_create_window (app, screen); -} - -GList * -vinagre_app_get_connections (VinagreApp *app) -{ - return NULL; -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-app.h vinagre-2.29.1/src/vinagre-app.h --- vinagre-2.26.1/src/vinagre-app.h 2008-07-26 13:09:45.000000000 +0100 +++ vinagre-2.29.1/src/vinagre-app.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -/* - * vinagre-app.h - * This file is part of vinagre - * - * Copyright (C) 2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_APP_H__ -#define __VINAGRE_APP_H__ - -#include - -#include "vinagre-window.h" - -G_BEGIN_DECLS - -#define VINAGRE_TYPE_APP (vinagre_app_get_type()) -#define VINAGRE_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_APP, VinagreApp)) -#define VINAGRE_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_APP, VinagreAppClass)) -#define VINAGRE_IS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_APP)) -#define VINAGRE_IS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_APP)) -#define VINAGRE_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_APP, VinagreAppClass)) - -typedef struct _VinagreAppPrivate VinagreAppPrivate; -typedef struct _VinagreApp VinagreApp; -typedef struct _VinagreAppClass VinagreAppClass; - -struct _VinagreApp -{ - GObject object; - VinagreAppPrivate *priv; -}; - - -struct _VinagreAppClass -{ - GObjectClass parent_class; -}; - - -GType vinagre_app_get_type (void) G_GNUC_CONST; - -VinagreApp *vinagre_app_get_default (void); - -VinagreWindow *vinagre_app_create_window (VinagreApp *app, - GdkScreen *screen); - -const GList *vinagre_app_get_windows (VinagreApp *app); -VinagreWindow *vinagre_app_get_active_window (VinagreApp *app); -GList *vinagre_app_get_connections (VinagreApp *app); - -VinagreWindow *vinagre_app_get_window_in_viewport (VinagreApp *app, - GdkScreen *screen, - gint workspace, - gint viewport_x, - gint viewport_y); - -G_END_DECLS - -#endif /* __VINAGRE_APP_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-applet.c vinagre-2.29.1/src/vinagre-applet.c --- vinagre-2.26.1/src/vinagre-applet.c 2009-01-22 13:21:23.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-applet.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,490 +0,0 @@ -/* - * vinagre-applet.c - * This file is part of vinagre - * - * Copyright (C) 2008,2009 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "vinagre-bookmarks.h" -#include "vinagre-bookmarks-entry.h" -#include "vinagre-utils.h" -#include "vinagre-connection.h" -#include "vinagre-commands.h" -#include - -#ifdef VINAGRE_ENABLE_AVAHI -#include "vinagre-mdns.h" -#endif - -#define VINAGRE_TYPE_APPLET (vinagre_applet_get_type ()) -#define VINAGRE_APPLET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), VINAGRE_TYPE_APPLET, VinagreApplet)) -#define VINAGRE_APPLET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), VINAGRE_TYPE_APPLET, VinagreAppletClass)) -#define VINAGRE_IS_APPLET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), VINAGRE_TYPE_APPLET)) -#define VINAGRE_IS_APPLET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), VINAGRE_TYPE_APPLET)) -#define VINAGRE_APPLET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), VINAGRE_TYPE_APPLET, VinagreAppletClass)) - -#define VINAGRE_APPLET_OAFID "OAFIID:GNOME_VinagreApplet" -#define VINAGRE_APPLET_FACTORY_OAFID "OAFIID:GNOME_VinagreApplet_Factory" -#define PANEL_APPLET_VERTICAL(p) (((p) == PANEL_APPLET_ORIENT_LEFT) || ((p) == PANEL_APPLET_ORIENT_RIGHT)) - -typedef struct{ - PanelApplet parent; - GdkPixbuf *icon; - gint icon_width, icon_height, size; -} VinagreApplet; - -typedef struct{ - PanelAppletClass parent_class; -} VinagreAppletClass; - -GType vinagre_applet_get_type (void); -static void vinagre_applet_class_init (VinagreAppletClass *klass); -static void vinagre_applet_init (VinagreApplet *applet); - -static void vinagre_applet_get_icon (VinagreApplet *applet); -static void vinagre_applet_check_size (VinagreApplet *applet); -static gboolean vinagre_applet_draw_cb (VinagreApplet *applet); -static void vinagre_applet_update_tooltip (VinagreApplet *applet); -static void vinagre_applet_dialog_about_cb (BonoboUIComponent *uic, gpointer data, const gchar *verbname); -static gboolean vinagre_applet_bonobo_cb (PanelApplet *_applet, const gchar *iid, gpointer data); -static void vinagre_applet_destroy_cb (GtkObject *object); - -G_DEFINE_TYPE (VinagreApplet, vinagre_applet, PANEL_TYPE_APPLET) - -static void -vinagre_applet_get_icon (VinagreApplet *applet) -{ - if (applet->icon != NULL) - { - g_object_unref (applet->icon); - applet->icon = NULL; - } - - if (applet->size <= 2) - return; - - applet->icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), - "vinagre", - applet->size - 2, - 0, - NULL); - - applet->icon_height = gdk_pixbuf_get_height (applet->icon); - applet->icon_width = gdk_pixbuf_get_width (applet->icon); -} - -static void -vinagre_applet_check_size (VinagreApplet *applet) -{ - /* we don't use the size function here, but the yet allocated size because the - size value is false (kind of rounded) */ - if (PANEL_APPLET_VERTICAL(panel_applet_get_orient (PANEL_APPLET (applet)))) - { - if (applet->size != GTK_WIDGET(applet)->allocation.width) - { - applet->size = GTK_WIDGET(applet)->allocation.width; - vinagre_applet_get_icon (applet); - gtk_widget_set_size_request (GTK_WIDGET(applet), applet->size, applet->icon_height + 2); - } - - /* Adjusting in case the icon size has changed */ - if (GTK_WIDGET(applet)->allocation.height < applet->icon_height + 2) - { - gtk_widget_set_size_request (GTK_WIDGET(applet), applet->size, applet->icon_height + 2); - } - } - else - { - if (applet->size != GTK_WIDGET(applet)->allocation.height) - { - applet->size = GTK_WIDGET(applet)->allocation.height; - vinagre_applet_get_icon (applet); - gtk_widget_set_size_request (GTK_WIDGET(applet), applet->icon_width + 2, applet->size); - } - - /* Adjusting in case the icon size has changed */ - if (GTK_WIDGET(applet)->allocation.width < applet->icon_width + 2) - { - gtk_widget_set_size_request (GTK_WIDGET(applet), applet->icon_width + 2, applet->size); - } - } -} - -static gboolean -vinagre_applet_draw_cb (VinagreApplet *applet) -{ - gint w, h, bg_type; - GdkColor color; - GdkGC *gc; - GdkPixmap *background; - - if (GTK_WIDGET (applet)->window == NULL) - return FALSE; - - /* Clear the window so we can draw on it later */ - gdk_window_clear (GTK_WIDGET(applet)->window); - - /* retrieve applet size */ - vinagre_applet_get_icon (applet); - vinagre_applet_check_size (applet); - if (applet->size <= 2) - return FALSE; - - /* if no icon, then don't try to display */ - if (applet->icon == NULL) - return FALSE; - - w = GTK_WIDGET(applet)->allocation.width; - h = GTK_WIDGET(applet)->allocation.height; - - gc = gdk_gc_new (GTK_WIDGET(applet)->window); - - /* draw pixmap background */ - bg_type = panel_applet_get_background (PANEL_APPLET (applet), &color, &background); - if (bg_type == PANEL_PIXMAP_BACKGROUND) - { - /* fill with given background pixmap */ - gdk_draw_drawable (GTK_WIDGET(applet)->window, gc, background, 0, 0, 0, 0, w, h); - } - - /* draw color background */ - if (bg_type == PANEL_COLOR_BACKGROUND) - { - gdk_gc_set_rgb_fg_color (gc,&color); - gdk_gc_set_fill (gc,GDK_SOLID); - gdk_draw_rectangle (GTK_WIDGET(applet)->window, gc, TRUE, 0, 0, w, h); - } - - /* draw icon at center */ - gdk_draw_pixbuf (GTK_WIDGET(applet)->window, gc, applet->icon, - 0, 0, (w - applet->icon_width)/2, (h - applet->icon_height)/2, - applet->icon_width, applet->icon_height, - GDK_RGB_DITHER_NONE, 0, 0); - - return TRUE; -} - -static void -vinagre_applet_change_background_cb (VinagreApplet *applet, - PanelAppletBackgroundType arg1, - GdkColor *arg2, GdkPixmap *arg3, gpointer data) -{ - gtk_widget_queue_draw (GTK_WIDGET (applet)); -} - -static void -vinagre_applet_destroy_cb (GtkObject *object) -{ - VinagreApplet *applet = VINAGRE_APPLET (object); - - if (applet->icon != NULL) - g_object_unref (applet->icon); -} - -static void -vinagre_applet_class_init (VinagreAppletClass *klass) -{ - /* nothing to do here */ -} - -static void -menu_position (GtkMenu *menu, - gint *x, - gint *y, - gboolean *push_in, - GtkWidget *applet) -{ - int applet_height, applet_width; - GtkRequisition requisition; - - gdk_window_get_origin (applet->window, x, y); - gdk_drawable_get_size (applet->window, &applet_width, &applet_height); - gtk_widget_size_request (GTK_WIDGET (menu), &requisition); - - switch (panel_applet_get_orient (PANEL_APPLET (applet))) - { - case PANEL_APPLET_ORIENT_DOWN: - *y += applet_height + 1; - break; - - case PANEL_APPLET_ORIENT_UP: - *y = MAX (*y - requisition.height - 2, 2*applet_height); - break; - - case PANEL_APPLET_ORIENT_LEFT: - *x = MAX (*x - requisition.width - 2, 2*applet_width); - break; - - case PANEL_APPLET_ORIENT_RIGHT: - *x += applet_height + 1; - break; - - default: - g_assert_not_reached (); - } - - *push_in = TRUE; -} - -static void -open_connection_cb (GtkMenuItem *item, - gpointer *user_data) -{ - GError *err = NULL; - gchar **argv; - VinagreConnection *conn; - - conn = VINAGRE_CONNECTION (g_object_get_data (G_OBJECT (item), "conn")); - - argv = g_new0 (gchar *, 3); - argv[0] = g_strdup ("vinagre"); - argv[1] = g_strdup (vinagre_connection_get_string_rep (conn, TRUE)); - argv[2] = NULL; - - if (!gdk_spawn_on_screen (gtk_widget_get_screen (GTK_WIDGET (item)), - NULL, - argv, - NULL, - G_SPAWN_SEARCH_PATH, - NULL, - NULL, - NULL, - &err)) - { - vinagre_utils_show_error (_("Could not run vinagre:"), err->message, NULL); - g_error_free (err); - } - - g_strfreev (argv); -} - -static void -fill_recursive_menu (GSList *entries, GtkWidget *menu) -{ - GSList *l; - GtkWidget *item, *image, *child; - - for (l = entries; l; l = l->next) - { - VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (l->data); - VinagreConnection *conn; - - switch (vinagre_bookmarks_entry_get_node (entry)) - { - case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: - image = gtk_image_new_from_icon_name ("folder", GTK_ICON_SIZE_MENU); - item = gtk_image_menu_item_new_with_label (vinagre_bookmarks_entry_get_name (entry)); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), - image); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), - item); - - child = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), child); - - fill_recursive_menu (vinagre_bookmarks_entry_get_children (entry), - child); - break; - - case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: - conn = vinagre_bookmarks_entry_get_conn (entry); - image = gtk_image_new_from_icon_name ("application-x-vnc", GTK_ICON_SIZE_MENU); - item = gtk_image_menu_item_new_with_label (vinagre_connection_get_name (conn)); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), - image); - - gtk_menu_shell_append (GTK_MENU_SHELL (menu), - item); - g_object_set_data (G_OBJECT (item), "conn", conn); - g_signal_connect (item, "activate", G_CALLBACK (open_connection_cb), NULL); - break; - - default: - g_assert_not_reached (); - } - } - -} - -static void -fill_menu (GSList *all, GtkWidget *menu) -{ - GtkWidget *item, *image; - - if (g_slist_length (all) == 0) - return; - - /* Separator */ - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - fill_recursive_menu (all, menu); -} - -static void -open_vinagre_cb (GtkMenuItem *item, - gpointer *user_data) -{ - GError *err = NULL; - - if (!g_spawn_command_line_async ("vinagre", &err)) - { - vinagre_utils_show_error (_("Could not run vinagre:"), err->message, NULL); - g_error_free (err); - } -} - -static gboolean -vinagre_applet_click_cb (GtkWidget *applet, - GdkEventButton *event, - gpointer user_data) -{ - GtkWidget *menu, *item, *image; - GSList *all; - - if ((event->type != GDK_BUTTON_PRESS) || (event->button != 1)) - return FALSE; - - menu = gtk_menu_new (); - - /* Open, first item */ - image = gtk_image_new_from_icon_name ("vinagre", GTK_ICON_SIZE_MENU); - item = gtk_image_menu_item_new_with_label (_("Open Remote Desktop Viewer")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), - image); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - g_signal_connect (item, "activate", G_CALLBACK (open_vinagre_cb), NULL); - - all = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()); - fill_menu (all, menu); - -#ifdef VINAGRE_ENABLE_AVAHI - all = vinagre_mdns_get_all (vinagre_mdns_get_default ()); - fill_menu (all, menu); -#endif - - gtk_widget_show_all (menu); - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, (GtkMenuPositionFunc) menu_position, applet, - event->button, event->time); - return TRUE; -} - -static void -vinagre_applet_help_cb (BonoboUIComponent *ui_container, - gpointer data, - const gchar *cname) -{ - vinagre_utils_help_contents (NULL); -} - -static void -vinagre_applet_about_cb (BonoboUIComponent *ui_container, - gpointer data, - const gchar *cname) -{ - vinagre_utils_help_about (NULL); -} - - -static void -vinagre_applet_init (VinagreApplet *applet) -{ - gchar *tmp; -#ifdef VINAGRE_ENABLE_AVAHI - VinagreMdns *mdns; -#endif - - applet->size = 0; - applet->icon = NULL; - - tmp = g_strdup_printf ("%s\n%s", - _("Remote Desktop Viewer"), - _("Access your bookmarks")); - gtk_widget_set_tooltip_text (GTK_WIDGET (applet), tmp); - g_free (tmp); - - panel_applet_set_flags (PANEL_APPLET (applet), PANEL_APPLET_EXPAND_MINOR); - gtk_widget_show_all (GTK_WIDGET(applet)); - vinagre_applet_draw_cb (applet); - - g_signal_connect (G_OBJECT (applet), "button-press-event", - G_CALLBACK (vinagre_applet_click_cb), NULL); - - g_signal_connect (G_OBJECT (applet), "expose-event", - G_CALLBACK (vinagre_applet_draw_cb), NULL); - - /* We use g_signal_connect_after because letting the panel draw - * the background is the only way to have the correct - * background when a theme defines a background picture. */ - g_signal_connect_after (G_OBJECT (applet), "expose-event", - G_CALLBACK (vinagre_applet_draw_cb), NULL); - - g_signal_connect (G_OBJECT (applet), "change-background", - G_CALLBACK (vinagre_applet_change_background_cb), NULL); - - g_signal_connect (G_OBJECT (applet), "change-orient", - G_CALLBACK (vinagre_applet_draw_cb), NULL); - - g_signal_connect (G_OBJECT (applet), "destroy", - G_CALLBACK (vinagre_applet_destroy_cb), NULL); - -#ifdef VINAGRE_ENABLE_AVAHI - mdns = vinagre_mdns_get_default (); -#endif -} - -static gboolean -vinagre_applet_fill (PanelApplet *_applet, - const gchar *iid, - gpointer data) -{ - VinagreApplet *applet = VINAGRE_APPLET (_applet); - - static const BonoboUIVerb menu_verbs[] = { - BONOBO_UI_VERB ("VinagreHelp", vinagre_applet_help_cb), - BONOBO_UI_VERB ("VinagreAbout", vinagre_applet_about_cb), - BONOBO_UI_VERB_END - }; - - if (strcmp (iid, VINAGRE_APPLET_OAFID) != 0) - return FALSE; - - bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - gtk_window_set_default_icon_name ("vinagre"); - g_set_application_name (_("Remote Desktop Viewer")); - - panel_applet_setup_menu_from_file (_applet, - NULL, - DATADIR "/vinagre/GNOME_VinagreApplet.xml", - NULL, menu_verbs, applet); - vinagre_applet_draw_cb (applet); - return TRUE; -} - -PANEL_APPLET_BONOBO_FACTORY (VINAGRE_APPLET_FACTORY_OAFID, - VINAGRE_TYPE_APPLET, - "VinagreApplet", - VERSION, - vinagre_applet_fill, - NULL); - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bacon.c vinagre-2.29.1/src/vinagre-bacon.c --- vinagre-2.26.1/src/vinagre-bacon.c 2008-11-16 10:59:00.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bacon.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,292 +0,0 @@ -/* - * vinagre-bacon.c - * This file is part of vinagre - * - * Copyright (C) 2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "bacon-message-connection.h" -#include "vinagre-utils.h" -#include "vinagre-connection.h" -#include "vinagre-app.h" -#include "vinagre-window.h" -#include "vinagre-commands.h" - -static guint32 startup_timestamp = 0; - -static GdkDisplay * -display_open_if_needed (const gchar *name) -{ - GSList *displays; - GSList *l; - GdkDisplay *display = NULL; - - displays = gdk_display_manager_list_displays (gdk_display_manager_get ()); - - for (l = displays; l != NULL; l = l->next) - { - if (strcmp (gdk_display_get_name ((GdkDisplay *) l->data), name) == 0) - { - display = l->data; - break; - } - } - - g_slist_free (displays); - - return display != NULL ? display : gdk_display_open (name); -} - -/* serverside */ -void -vinagre_bacon_message_received (const char *message, - gpointer data) -{ - gchar **commands; - gchar **params; - gint workspace; - gint viewport_x; - gint viewport_y; - gchar *display_name; - gint screen_number; - gint i; - VinagreApp *app; - VinagreWindow *window; - GdkDisplay *display; - GdkScreen *screen; - gboolean new_window = FALSE; - GSList *servers = NULL; - GSList *l, *next; - VinagreConnection *conn; - gchar *error; - - g_return_if_fail (message != NULL); - - commands = g_strsplit (message, "\v", -1); - - /* header */ - params = g_strsplit (commands[0], "\t", 6); - startup_timestamp = atoi (params[0]); - display_name = params[1]; - screen_number = atoi (params[2]); - workspace = atoi (params[3]); - viewport_x = atoi (params[4]); - viewport_y = atoi (params[5]); - - display = display_open_if_needed (display_name); - if (display == NULL) - { - g_warning ("Could not open display %s\n", display_name); - g_strfreev (params); - goto out; - } - - screen = gdk_display_get_screen (display, screen_number); - g_strfreev (params); - - /* body */ - for (i = 1; commands[i] != NULL; i++) - { - params = g_strsplit (commands[i], "\t", -1); - - if (strcmp (params[0], "NEW-WINDOW") == 0) - new_window = TRUE; - - else if (strcmp (params[0], "OPEN-URIS") == 0) - { - gint n_uris, j; - gchar **uris; - - n_uris = atoi (params[1]); - uris = g_strsplit (params[2], " ", n_uris); - - for (j = 0; j < n_uris; j++) - { - conn = vinagre_connection_new_from_string (uris[j], &error, TRUE); - if (conn) - servers = g_slist_prepend (servers, conn); - else - /*FIXME: Show a dialog error?*/ - g_free (error); - } - - g_strfreev (uris); - } - - else - { - g_warning ("Unexpected bacon command"); - } - - g_strfreev (params); - } - - /* execute the commands */ - app = vinagre_app_get_default (); - if (new_window) - window = vinagre_app_create_window (app, screen); - else - /* get a window in the current workspace (if exists) and raise it */ - window = vinagre_app_get_window_in_viewport (app, - screen, - workspace, - viewport_x, - viewport_y); - - for (l = servers; l; l = next) - { - VinagreConnection *conn = l->data; - - next = l->next; - vinagre_cmd_direct_connect (conn, window); - } - - /* set the proper interaction time on the window. - * Fall back to roundtripping to the X server when we - * don't have the timestamp, e.g. when launched from - * terminal. We also need to make sure that the window - * has been realized otherwise it will not work. lame. - */ - if (!GTK_WIDGET_REALIZED (window)) - gtk_widget_realize (GTK_WIDGET (window)); - - if (startup_timestamp <= 0) - startup_timestamp = gdk_x11_get_server_time (GTK_WIDGET (window)->window); - - gdk_x11_window_set_user_time (GTK_WIDGET (window)->window, - startup_timestamp); - gtk_window_present (GTK_WINDOW (window)); - - out: - g_strfreev (commands); -} - -/* clientside */ -static void -vinagre_bacon_send_message (BaconMessageConnection *connection, - GSList *servers, - gboolean new_window) -{ - GdkScreen *screen; - GdkDisplay *display; - const gchar *display_name; - gint screen_number; - gint ws; - gint viewport_x; - gint viewport_y; - GString *command; - - /* the messages have the following format: - * <--- header ---> <---- body -----> - * timestamp \t display_name \t screen_number \t workspace \t viewport_x \t viewport_y \v OP1 \t arg \t arg \v OP2 \t arg \t arg|... - * - * when the arg is a list of uri, they are separated by a space. - * So the delimiters are \v for the commands, \t for the tokens in - * a command and ' ' for the uris: note that such delimiters cannot - * be part of an uri, this way parsing is easier. - */ - - screen = gdk_screen_get_default (); - display = gdk_screen_get_display (screen); - - display_name = gdk_display_get_name (display); - screen_number = gdk_screen_get_number (screen); - - ws = vinagre_utils_get_current_workspace (screen); - vinagre_utils_get_current_viewport (screen, &viewport_x, &viewport_y); - - command = g_string_new (NULL); - - /* header */ - g_string_append_printf (command, - "%" G_GUINT32_FORMAT "\t%s\t%d\t%d\t%d\t%d", - startup_timestamp, - display_name, - screen_number, - ws, - viewport_x, - viewport_y); - - /* NEW-WINDOW command */ - if (new_window) - { - command = g_string_append_c (command, '\v'); - command = g_string_append (command, "NEW-WINDOW"); - } - - /* OPEN_URIS command */ - if (servers) - { - GSList *l; - - command = g_string_append_c (command, '\v'); - command = g_string_append (command, "OPEN-URIS"); - - g_string_append_printf (command, "\t%d\t", g_slist_length (servers)); - - for (l = servers; l != NULL; l = l->next) - { - VinagreConnection *conn = l->data; - g_string_append_printf (command, "%s:%d", - vinagre_connection_get_host (conn), - vinagre_connection_get_port (conn)); - if (l->next != NULL) - command = g_string_append_c (command, ' '); - } - } - - bacon_message_connection_send (connection, - command->str); - - g_string_free (command, TRUE); -} - -void -vinagre_bacon_start (GSList *servers, gboolean new_window) -{ - BaconMessageConnection *connection; - - connection = bacon_message_connection_new ("vinagre"); - if (!connection) - { - g_warning ("Cannot create the 'vinagre' connection."); - return; - } - - if (!bacon_message_connection_get_is_server (connection)) - { - vinagre_bacon_send_message (connection, servers, new_window); - - gdk_notify_startup_complete (); - - g_slist_foreach (servers, (GFunc) g_object_unref, NULL); - g_slist_free (servers); - bacon_message_connection_free (connection); - - exit (0); - } - else - { - bacon_message_connection_set_callback (connection, - vinagre_bacon_message_received, - NULL); - } -} -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bacon.h vinagre-2.29.1/src/vinagre-bacon.h --- vinagre-2.26.1/src/vinagre-bacon.h 2008-07-26 13:09:45.000000000 +0100 +++ vinagre-2.29.1/src/vinagre-bacon.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -/* - * vinagre-bacon.h - * This file is part of vinagre - * - * Copyright (C) 2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_BACON_H__ -#define __VINAGRE_BACON_H__ - -void vinagre_bacon_start (GSList *servers, gboolean new_window); - -#endif /* __VINAGRE_BACON_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks.c vinagre-2.29.1/src/vinagre-bookmarks.c --- vinagre-2.26.1/src/vinagre-bookmarks.c 2009-03-20 15:15:23.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,557 +0,0 @@ -/* - * vinagre-bookmarks.c - * This file is part of vinagre - * - * Copyright (C) 2007,2008 Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include - -#include "vinagre-bookmarks.h" -#include "vinagre-bookmarks-entry.h" -#include "vinagre-bookmarks-migration.h" - -struct _VinagreBookmarksPrivate -{ - gchar *filename; - GSList *entries, *conns; - GFileMonitor *monitor; -}; - -enum -{ - BOOKMARK_CHANGED, - LAST_SIGNAL -}; - -G_DEFINE_TYPE (VinagreBookmarks, vinagre_bookmarks, G_TYPE_OBJECT); - -static VinagreBookmarks *book_singleton = NULL; -static guint signals[LAST_SIGNAL] = { 0 }; - -/* Prototypes */ -static void vinagre_bookmarks_update_from_file (VinagreBookmarks *book); -static void vinagre_bookmarks_file_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - VinagreBookmarks *book); - -static void -vinagre_bookmarks_init (VinagreBookmarks *book) -{ - GFile *gfile; - - book->priv = G_TYPE_INSTANCE_GET_PRIVATE (book, VINAGRE_TYPE_BOOKMARKS, VinagreBookmarksPrivate); - book->priv->entries = NULL; - book->priv->filename = g_build_filename (g_get_user_data_dir (), - "vinagre", - VINAGRE_BOOKMARKS_FILE, - NULL); - - if (!g_file_test (book->priv->filename, G_FILE_TEST_EXISTS)) - vinagre_bookmarks_migration_migrate (book->priv->filename); - - vinagre_bookmarks_update_from_file (book); - - gfile = g_file_new_for_path (book->priv->filename); - book->priv->monitor = g_file_monitor_file (gfile, - G_FILE_MONITOR_NONE, - NULL, - NULL); - g_object_unref (gfile); - - g_signal_connect (book->priv->monitor, - "changed", - G_CALLBACK (vinagre_bookmarks_file_changed), - book); -} - -static void -vinagre_bookmarks_clear_entries (VinagreBookmarks *book) -{ - g_slist_foreach (book->priv->entries, (GFunc) g_object_unref, NULL); - g_slist_free (book->priv->entries); - - book->priv->entries = NULL; -} - -static void -vinagre_bookmarks_finalize (GObject *object) -{ - VinagreBookmarks *book = VINAGRE_BOOKMARKS (object); - - g_free (book->priv->filename); - book->priv->filename = NULL; - - G_OBJECT_CLASS (vinagre_bookmarks_parent_class)->finalize (object); -} - -static void -vinagre_bookmarks_dispose (GObject *object) -{ - VinagreBookmarks *book = VINAGRE_BOOKMARKS (object); - - if (book->priv->entries) - vinagre_bookmarks_clear_entries (book); - - if (book->priv->monitor) - { - g_file_monitor_cancel (book->priv->monitor); - g_object_unref (book->priv->monitor); - book->priv->monitor = NULL; - } - - G_OBJECT_CLASS (vinagre_bookmarks_parent_class)->dispose (object); -} - -static void -vinagre_bookmarks_class_init (VinagreBookmarksClass *klass) -{ - GObjectClass* object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (VinagreBookmarksPrivate)); - - object_class->finalize = vinagre_bookmarks_finalize; - object_class->dispose = vinagre_bookmarks_dispose; - - signals[BOOKMARK_CHANGED] = - g_signal_new ("changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (VinagreBookmarksClass, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); -} - -static VinagreConnection * -find_conn_by_host (GSList *entries, const gchar *host, gint port) -{ - GSList *l; - VinagreConnection *conn; - - for (l = entries; l; l = l->next) - { - VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (l->data); - - switch (vinagre_bookmarks_entry_get_node (entry)) - { - case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: - if ((conn = find_conn_by_host (vinagre_bookmarks_entry_get_children (entry), - host, - port))) - return conn; - break; - - case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: - conn = vinagre_bookmarks_entry_get_conn (entry); - if ( (g_str_equal (host, vinagre_connection_get_host (conn))) && - (port == vinagre_connection_get_port (conn) ) ) - return g_object_ref (conn); - break; - - default: - g_assert_not_reached (); - } - } - return NULL; -} - -VinagreConnection * -vinagre_bookmarks_exists (VinagreBookmarks *book, - const gchar *host, - gint port) -{ - VinagreConnection *conn = NULL; - GSList *l, *next; - - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS (book), NULL); - g_return_val_if_fail (host != NULL, NULL); - - return find_conn_by_host (book->priv->entries, host, port); -} - -static void -vinagre_bookmarks_save_fill_xml (GSList *list, xmlTextWriter *writer) -{ - GSList *l; - VinagreBookmarksEntry *entry; - VinagreConnection *conn; - - for (l = list; l; l = l->next) - { - entry = (VinagreBookmarksEntry *) l->data; - switch (vinagre_bookmarks_entry_get_node (entry)) - { - case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: - xmlTextWriterStartElement (writer, "folder"); - xmlTextWriterWriteAttribute (writer, "name", vinagre_bookmarks_entry_get_name (entry)); - - vinagre_bookmarks_save_fill_xml (vinagre_bookmarks_entry_get_children (entry), writer); - xmlTextWriterEndElement (writer); - break; - - case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: - conn = vinagre_bookmarks_entry_get_conn (entry); - - xmlTextWriterStartElement (writer, "item"); - xmlTextWriterWriteElement (writer, "name", vinagre_connection_get_name (conn)); - xmlTextWriterWriteElement (writer, "host", vinagre_connection_get_host (conn)); - xmlTextWriterWriteFormatElement (writer, "port", "%d", vinagre_connection_get_port (conn)); - xmlTextWriterWriteFormatElement (writer, "view_only", "%d", vinagre_connection_get_view_only (conn)); - xmlTextWriterWriteFormatElement (writer, "scaling", "%d", vinagre_connection_get_scaling (conn)); - xmlTextWriterWriteFormatElement (writer, "fullscreen", "%d", vinagre_connection_get_fullscreen (conn)); - - xmlTextWriterEndElement (writer); - break; - - default: - g_assert_not_reached (); - } - } -} - -static gboolean -vinagre_bookmarks_parse_boolean (const gchar* value) -{ - if (g_ascii_strcasecmp (value, "true") == 0 || strcmp (value, "1") == 0) - return TRUE; - - return FALSE; -} - -static VinagreBookmarksEntry * -vinagre_bookmarks_parse_item (xmlNode *root) -{ - VinagreBookmarksEntry *entry = NULL; - VinagreConnection *conn; - xmlNode *curr; - xmlChar *s_value; - - conn = vinagre_connection_new (); - - for (curr = root->children; curr; curr = curr->next) - { - s_value = xmlNodeGetContent (curr); - - if (!xmlStrcmp(curr->name, (const xmlChar *)"host")) - vinagre_connection_set_host (conn, s_value); - else if (!xmlStrcmp(curr->name, (const xmlChar *)"name")) - vinagre_connection_set_name (conn, s_value); - else if (!xmlStrcmp(curr->name, (const xmlChar *)"port")) - vinagre_connection_set_port (conn, atoi (s_value)); - else if (!xmlStrcmp(curr->name, (const xmlChar *)"view_only")) - vinagre_connection_set_view_only (conn, vinagre_bookmarks_parse_boolean (s_value)); - else if (!xmlStrcmp(curr->name, (const xmlChar *)"scaling")) - vinagre_connection_set_scaling (conn, vinagre_bookmarks_parse_boolean (s_value)); - else if (!xmlStrcmp(curr->name, (const xmlChar *)"fullscreen")) - vinagre_connection_set_fullscreen (conn, vinagre_bookmarks_parse_boolean (s_value)); - - xmlFree (s_value); - } - - if (vinagre_connection_get_port (conn) <= 0) - vinagre_connection_set_port (conn, 5900); - - if (vinagre_connection_get_host (conn)) - entry = vinagre_bookmarks_entry_new_conn (conn); - - g_object_unref (conn); - - return entry; -} - -static void -vinagre_bookmarks_parse_xml (VinagreBookmarks *book, xmlNode *root, VinagreBookmarksEntry *parent_entry) -{ - xmlNode *curr; - xmlChar *folder_name; - VinagreBookmarksEntry *entry; - - for (curr = root; curr; curr = curr->next) - { - if (curr->type == XML_ELEMENT_NODE) - { - if (!xmlStrcmp(curr->name, (const xmlChar *)"folder")) - { - folder_name = xmlGetProp (curr, (const xmlChar *)"name"); - if (folder_name && *folder_name) - { - entry = vinagre_bookmarks_entry_new_folder ((const gchar *) folder_name); - if (parent_entry) - vinagre_bookmarks_entry_add_child (parent_entry, entry); - else - book->priv->entries = g_slist_insert_sorted (book->priv->entries, - entry, - (GCompareFunc)vinagre_bookmarks_entry_compare); - - vinagre_bookmarks_parse_xml (book, curr->children, entry); - } - xmlFree (folder_name); - } - else if (!xmlStrcmp(curr->name, (const xmlChar *)"item")) - { - entry = vinagre_bookmarks_parse_item (curr); - if (entry) - { - if (parent_entry) - vinagre_bookmarks_entry_add_child (parent_entry, entry); - else - book->priv->entries = g_slist_insert_sorted (book->priv->entries, - entry, - (GCompareFunc)vinagre_bookmarks_entry_compare); - } - } - } - } - -} - -static void -vinagre_bookmarks_update_from_file (VinagreBookmarks *book) -{ - xmlErrorPtr error; - xmlNodePtr root; - xmlDocPtr doc; - - if (!g_file_test (book->priv->filename, G_FILE_TEST_EXISTS)) - return; - - doc = xmlReadFile (book->priv->filename, NULL, XML_PARSE_NOERROR); - - if (!doc) - { - error = xmlGetLastError (); - g_warning (_("Error while initializing bookmarks: %s"), error?error->message: _("Unknown error")); - return; - } - - root = xmlDocGetRootElement (doc); - if (!root) - { - g_warning (_("Error while initializing bookmarks: The file seems to be empty")); - xmlFreeDoc (doc); - return; - } - - if (xmlStrcmp (root->name, (const xmlChar *) "vinagre-bookmarks")) - { - g_warning (_("Error while initializing bookmarks: The file is not a vinagre bookmarks file")); - xmlFreeDoc (doc); - return; - } - - vinagre_bookmarks_clear_entries (book); - vinagre_bookmarks_parse_xml (book, root->xmlChildrenNode, NULL); - xmlFreeDoc (doc); -} - - -static void -vinagre_bookmarks_file_changed (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event_type, - VinagreBookmarks *book) -{ - if (event_type != G_FILE_MONITOR_EVENT_CHANGED && - event_type != G_FILE_MONITOR_EVENT_CREATED && - event_type != G_FILE_MONITOR_EVENT_DELETED) - return; - - vinagre_bookmarks_update_from_file (book); - - g_signal_emit (book, signals[BOOKMARK_CHANGED], 0); -} - -/* Public API */ - -VinagreBookmarks * -vinagre_bookmarks_get_default (void) -{ - if (G_UNLIKELY (!book_singleton)) - book_singleton = VINAGRE_BOOKMARKS (g_object_new (VINAGRE_TYPE_BOOKMARKS, - NULL)); - return book_singleton; -} - -GSList * -vinagre_bookmarks_get_all (VinagreBookmarks *book) -{ - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS (book), NULL); - - return book->priv->entries; -} - -void -vinagre_bookmarks_save_to_file (VinagreBookmarks *book) -{ - xmlTextWriter *writer; - xmlBuffer *buf; - int rc; - GError *error; - - writer = NULL; - buf = NULL; - error = NULL; - - buf = xmlBufferCreate (); - if (!buf) - { - g_warning (_("Error while saving bookmarks: Failed to create the XML structure")); - return; - } - - writer = xmlNewTextWriterMemory(buf, 0); - if (!writer) - { - g_warning (_("Error while saving bookmarks: Failed to create the XML structure")); - goto finalize; - } - - rc = xmlTextWriterStartDocument (writer, NULL, "utf-8", NULL); - if (rc < 0) - { - g_warning (_("Error while saving bookmarks: Failed to initialize the XML structure")); - goto finalize; - } - - rc = xmlTextWriterStartElement (writer, "vinagre-bookmarks"); - if (rc < 0) - { - g_warning (_("Error while saving bookmarks: Failed to initialize the XML structure")); - goto finalize; - } - - vinagre_bookmarks_save_fill_xml (book->priv->entries, writer); - - rc = xmlTextWriterEndDocument (writer); - if (rc < 0) - { - g_warning (_("Error while saving bookmarks: Failed to finalize the XML structure")); - goto finalize; - } - - if (!g_file_set_contents (book->priv->filename, - (const char *) buf->content, - -1, - &error)) - { - g_warning (_("Error while saving bookmarks: %s"), error?error->message:_("Unknown error")); - if (error) - g_error_free (error); - goto finalize; - } - -finalize: - if (writer) - xmlFreeTextWriter (writer); - if (buf) - xmlBufferFree (buf); -} - -void -vinagre_bookmarks_add_entry (VinagreBookmarks *book, - VinagreBookmarksEntry *entry, - VinagreBookmarksEntry *parent) -{ - /* I do not ref entry */ - if (parent) - vinagre_bookmarks_entry_add_child (parent, entry); - else - book->priv->entries = g_slist_insert_sorted (book->priv->entries, - entry, - (GCompareFunc)vinagre_bookmarks_entry_compare); - vinagre_bookmarks_save_to_file (book); -} - -gboolean -vinagre_bookmarks_remove_entry (VinagreBookmarks *book, - VinagreBookmarksEntry *entry) -{ - GSList *l; - - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS (book), FALSE); - - /* I do unref entry */ - if (g_slist_index (book->priv->entries, entry) > -1) - { - book->priv->entries = g_slist_remove (book->priv->entries, entry); - g_object_unref (entry); - vinagre_bookmarks_save_to_file (book); - return TRUE; - } - - for (l = book->priv->entries; l; l = l->next) - { - VinagreBookmarksEntry *e = (VinagreBookmarksEntry *) l->data; - - if (vinagre_bookmarks_entry_get_node (e) != VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) - continue; - - if (vinagre_bookmarks_entry_remove_child (e, entry)) - { - g_object_unref (entry); - vinagre_bookmarks_save_to_file (book); - return TRUE; - } - } - - return FALSE; -} - - -VinagreBookmarksEntry * -vinagre_bookmarks_name_exists (VinagreBookmarks *book, - VinagreBookmarksEntry *parent, - const gchar *name) -{ - GSList *entries, *l; - - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS (book), FALSE); - - if (parent) - entries = vinagre_bookmarks_entry_get_children (parent); - else - entries = book->priv->entries; - - for (l = entries; l; l = l->next) - { - VinagreBookmarksEntry *e = (VinagreBookmarksEntry *) l->data; - - if (vinagre_bookmarks_entry_get_node (e) == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) - { - if (g_strcmp0 (vinagre_bookmarks_entry_get_name (e), name) == 0) - return e; - } - else - { - VinagreConnection *conn = vinagre_bookmarks_entry_get_conn (e); - if (g_strcmp0 (vinagre_connection_get_name (conn), name) == 0) - return e; - } - } - - return NULL; -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks-entry.c vinagre-2.29.1/src/vinagre-bookmarks-entry.c --- vinagre-2.26.1/src/vinagre-bookmarks-entry.c 2008-12-11 19:11:08.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks-entry.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,288 +0,0 @@ -/* - * vinagre-bookmarks-entry.c - * This file is part of vinagre - * - * Copyright (C) 2008 Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "vinagre-bookmarks-entry.h" - -struct _VinagreBookmarksEntryPrivate -{ - VinagreBookmarksEntryNode node; - VinagreConnection *conn; - gchar *name; - GSList *children; // array of VinagreBookmarksEntry - VinagreBookmarksEntry *parent; -}; - -G_DEFINE_TYPE (VinagreBookmarksEntry, vinagre_bookmarks_entry, G_TYPE_OBJECT); - -static void -vinagre_bookmarks_entry_init (VinagreBookmarksEntry *entry) -{ - entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry, VINAGRE_TYPE_BOOKMARKS_ENTRY, VinagreBookmarksEntryPrivate); - - entry->priv->node = VINAGRE_BOOKMARKS_ENTRY_NODE_INVALID; - entry->priv->conn = NULL; - entry->priv->name = NULL; - entry->priv->children = NULL; - entry->priv->parent = NULL; -} - -static void -vinagre_bookmarks_entry_finalize (GObject *object) -{ - VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (object); - - if (entry->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) - g_free (entry->priv->name); - - G_OBJECT_CLASS (vinagre_bookmarks_entry_parent_class)->finalize (object); -} - -static void -vinagre_bookmarks_entry_dispose (GObject *object) -{ - VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (object); - - switch (entry->priv->node) - { - case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: - if (entry->priv->conn) - { - g_object_unref (entry->priv->conn); - entry->priv->conn = NULL; - } - break; - - case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: - if (entry->priv->children) - { - g_slist_foreach (entry->priv->children, (GFunc) g_object_unref, NULL); - g_slist_free (entry->priv->children); - entry->priv->children = NULL; - } - break; - - default: - g_assert_not_reached (); - } - - G_OBJECT_CLASS (vinagre_bookmarks_entry_parent_class)->dispose (object); -} - -static void -vinagre_bookmarks_entry_class_init (VinagreBookmarksEntryClass *klass) -{ - GObjectClass* object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (VinagreBookmarksEntryPrivate)); - - object_class->finalize = vinagre_bookmarks_entry_finalize; - object_class->dispose = vinagre_bookmarks_entry_dispose; -} - -VinagreBookmarksEntry * -vinagre_bookmarks_entry_new_folder (const gchar *name) -{ - VinagreBookmarksEntry *entry; - - g_return_val_if_fail (name != NULL, NULL); - - entry = VINAGRE_BOOKMARKS_ENTRY (g_object_new (VINAGRE_TYPE_BOOKMARKS_ENTRY, NULL)); - vinagre_bookmarks_entry_set_node (entry, VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER); - vinagre_bookmarks_entry_set_name (entry, name); - - return entry; -} - -VinagreBookmarksEntry * -vinagre_bookmarks_entry_new_conn (VinagreConnection *conn) -{ - VinagreBookmarksEntry *entry; - - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - entry = VINAGRE_BOOKMARKS_ENTRY (g_object_new (VINAGRE_TYPE_BOOKMARKS_ENTRY, NULL)); - vinagre_bookmarks_entry_set_node (entry, VINAGRE_BOOKMARKS_ENTRY_NODE_CONN); - vinagre_bookmarks_entry_set_conn (entry, conn); - - return entry; - -} - -void -vinagre_bookmarks_entry_set_node (VinagreBookmarksEntry *entry, VinagreBookmarksEntryNode node) -{ - g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); - - if (entry->priv->node == node) - return; - - entry->priv->node = node; - - switch (entry->priv->node) - { - case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: - g_free (entry->priv->name); - entry->priv->name = NULL; - g_slist_foreach (entry->priv->children, (GFunc) g_object_unref, NULL); - g_slist_free (entry->priv->children); - entry->priv->children = NULL; - break; - - case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: - if (entry->priv->conn) - { - g_object_unref (entry->priv->conn); - entry->priv->conn = NULL; - } - break; - - default: - g_assert_not_reached (); - } -} - -VinagreBookmarksEntryNode -vinagre_bookmarks_entry_get_node (VinagreBookmarksEntry *entry) -{ - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), VINAGRE_BOOKMARKS_ENTRY_NODE_INVALID); - - return entry->priv->node; -} - -void -vinagre_bookmarks_entry_set_conn (VinagreBookmarksEntry *entry, VinagreConnection *conn) -{ - g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - g_return_if_fail (entry->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_CONN); - - if (entry->priv->conn != NULL) - g_object_unref (entry->priv->conn); - - entry->priv->conn = g_object_ref (conn); -} - -VinagreConnection * -vinagre_bookmarks_entry_get_conn (VinagreBookmarksEntry *entry) -{ - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), NULL); - - return entry->priv->conn; -} - -void -vinagre_bookmarks_entry_set_name (VinagreBookmarksEntry *entry, const gchar *name) -{ - g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); - g_return_if_fail (entry->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER); - g_return_if_fail (name != NULL); - - g_free (entry->priv->name); - entry->priv->name = g_strdup (name); -} - -const gchar * -vinagre_bookmarks_entry_get_name (VinagreBookmarksEntry *entry) -{ - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), NULL); - - return entry->priv->name; -} - -void -vinagre_bookmarks_entry_add_child (VinagreBookmarksEntry *entry, VinagreBookmarksEntry *child) -{ - g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); - g_return_if_fail (entry->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER); - g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (child)); - - entry->priv->children = g_slist_insert_sorted (entry->priv->children, - child, - (GCompareFunc)vinagre_bookmarks_entry_compare); - child->priv->parent = entry; -} - -gboolean -vinagre_bookmarks_entry_remove_child (VinagreBookmarksEntry *entry, - VinagreBookmarksEntry *child) -{ - GSList *l; - - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), FALSE); - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (child), FALSE); - - if (g_slist_index (entry->priv->children, child) > -1) - { - entry->priv->children = g_slist_remove (entry->priv->children, child); - return TRUE; - } - - for (l = entry->priv->children; l; l = l->next) - { - VinagreBookmarksEntry *e = (VinagreBookmarksEntry *) l->data; - - if (vinagre_bookmarks_entry_get_node (e) != VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) - continue; - - if (vinagre_bookmarks_entry_remove_child (e, child)) - return TRUE; - } - - return FALSE; -} - -GSList * -vinagre_bookmarks_entry_get_children (VinagreBookmarksEntry *entry) -{ - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), NULL); - - return entry->priv->children; -} - -VinagreBookmarksEntry * -vinagre_bookmarks_entry_get_parent (VinagreBookmarksEntry *entry) -{ - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), NULL); - - return entry->priv->parent; -} - -gint -vinagre_bookmarks_entry_compare (VinagreBookmarksEntry *a, VinagreBookmarksEntry *b) -{ - gchar *name_a, *name_b; - gint result; - - if (a->priv->node != b->priv->node) - return a->priv->node - b->priv->node; - - if (a->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) - return g_ascii_strcasecmp (a->priv->name, b->priv->name); - - name_a = vinagre_connection_get_best_name (a->priv->conn); - name_b = vinagre_connection_get_best_name (b->priv->conn); - result = g_ascii_strcasecmp (name_a, name_b); - g_free (name_a); - g_free (name_b); - - return result; -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks-entry.h vinagre-2.29.1/src/vinagre-bookmarks-entry.h --- vinagre-2.26.1/src/vinagre-bookmarks-entry.h 2008-12-10 18:50:09.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks-entry.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -/* - * vinagre-bookmarks-entry.h - * This file is part of vinagre - * - * Copyright (C) 2008 Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_BOOKMARKS_ENTRY_H__ -#define __VINAGRE_BOOKMARKS_ENTRY_H__ - -#include -#include "vinagre-connection.h" - -G_BEGIN_DECLS - -#define VINAGRE_TYPE_BOOKMARKS_ENTRY (vinagre_bookmarks_entry_get_type ()) -#define VINAGRE_BOOKMARKS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_BOOKMARKS_ENTRY, VinagreBookmarksEntry)) -#define VINAGRE_BOOKMARKS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_BOOKMARKS_ENTRY, VinagreBookmarksEntryClass)) -#define VINAGRE_IS_BOOKMARKS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_BOOKMARKS_ENTRY)) -#define VINAGRE_IS_BOOKMARKS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_BOOKMARKS_ENTRY)) -#define VINAGRE_BOOKMARKS_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_BOOKMARKS_ENTRY, VinagreBookmarksEntryClass)) - -typedef struct _VinagreBookmarksEntryClass VinagreBookmarksEntryClass; -typedef struct _VinagreBookmarksEntry VinagreBookmarksEntry; -typedef struct _VinagreBookmarksEntryPrivate VinagreBookmarksEntryPrivate; - -typedef enum { - VINAGRE_BOOKMARKS_ENTRY_NODE_INVALID = 0, - VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER, - VINAGRE_BOOKMARKS_ENTRY_NODE_CONN -} VinagreBookmarksEntryNode; - -struct _VinagreBookmarksEntryClass -{ - GObjectClass parent_class; -}; - -struct _VinagreBookmarksEntry -{ - GObject parent_instance; - VinagreBookmarksEntryPrivate *priv; -}; - - -GType vinagre_bookmarks_entry_get_type (void) G_GNUC_CONST; - -VinagreBookmarksEntry * vinagre_bookmarks_entry_new_folder (const gchar *name); -VinagreBookmarksEntry * vinagre_bookmarks_entry_new_conn (VinagreConnection *conn); - -void vinagre_bookmarks_entry_add_child (VinagreBookmarksEntry *entry, VinagreBookmarksEntry *child); -gboolean vinagre_bookmarks_entry_remove_child(VinagreBookmarksEntry *entry, - VinagreBookmarksEntry *child); - -GSList * vinagre_bookmarks_entry_get_children(VinagreBookmarksEntry *entry); - -void vinagre_bookmarks_entry_set_node (VinagreBookmarksEntry *entry, VinagreBookmarksEntryNode node); -VinagreBookmarksEntryNode vinagre_bookmarks_entry_get_node (VinagreBookmarksEntry *entry); - -void vinagre_bookmarks_entry_set_conn (VinagreBookmarksEntry *entry, VinagreConnection *conn); -VinagreConnection * vinagre_bookmarks_entry_get_conn (VinagreBookmarksEntry *entry); - -void vinagre_bookmarks_entry_set_name (VinagreBookmarksEntry *entry, const gchar *name); -const gchar * vinagre_bookmarks_entry_get_name (VinagreBookmarksEntry *entry); - -//void vinagre_bookmarks_entry_set_parent (VinagreBookmarksEntry *entry, VinagreBookmarksEntry *parent); -VinagreBookmarksEntry * vinagre_bookmarks_entry_get_parent (VinagreBookmarksEntry *entry); - -gint vinagre_bookmarks_entry_compare (VinagreBookmarksEntry *a, VinagreBookmarksEntry *b); -G_END_DECLS - -#endif /* __VINAGRE_BOOKMARKS_ENTRY_H__ */ - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks.h vinagre-2.29.1/src/vinagre-bookmarks.h --- vinagre-2.26.1/src/vinagre-bookmarks.h 2009-03-20 15:14:57.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -/* - * vinagre-bookmarks.h - * This file is part of vinagre - * - * Copyright (C) 2007,2008 Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_BOOKMARKS_H__ -#define __VINAGRE_BOOKMARKS_H__ - -#include -#include - -#include "vinagre-connection.h" -#include "vinagre-bookmarks-entry.h" - -G_BEGIN_DECLS - -#define VINAGRE_BOOKMARKS_FILE "vinagre-bookmarks.xml" -#define VINAGRE_BOOKMARKS_FILE_OLD "vinagre.bookmarks" - -#define VINAGRE_TYPE_BOOKMARKS (vinagre_bookmarks_get_type ()) -#define VINAGRE_BOOKMARKS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_BOOKMARKS, VinagreBookmarks)) -#define VINAGRE_BOOKMARKS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_BOOKMARKS, VinagreBookmarksClass)) -#define VINAGRE_IS_BOOKMARKS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_BOOKMARKS)) -#define VINAGRE_IS_BOOKMARKS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_BOOKMARKS)) -#define VINAGRE_BOOKMARKS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_BOOKMARKS, VinagreBookmarksClass)) - -typedef struct _VinagreBookmarksClass VinagreBookmarksClass; -typedef struct _VinagreBookmarks VinagreBookmarks; -typedef struct _VinagreBookmarksPrivate VinagreBookmarksPrivate; - -struct _VinagreBookmarksClass -{ - GObjectClass parent_class; - - /* Signals */ - void (* changed) (VinagreBookmarks *book); -}; - -struct _VinagreBookmarks -{ - GObject parent_instance; - VinagreBookmarksPrivate *priv; -}; - -#include "vinagre-window.h" - -GType vinagre_bookmarks_get_type (void) G_GNUC_CONST; - -VinagreBookmarks *vinagre_bookmarks_get_default (void); -GSList *vinagre_bookmarks_get_all (VinagreBookmarks *book); -void vinagre_bookmarks_save_to_file (VinagreBookmarks *book); -void vinagre_bookmarks_add_entry (VinagreBookmarks *book, - VinagreBookmarksEntry *entry, - VinagreBookmarksEntry *parent); -gboolean vinagre_bookmarks_remove_entry (VinagreBookmarks *book, - VinagreBookmarksEntry *entry); - -VinagreConnection *vinagre_bookmarks_exists (VinagreBookmarks *book, - const gchar *host, - gint port); - -VinagreBookmarksEntry *vinagre_bookmarks_name_exists (VinagreBookmarks *book, - VinagreBookmarksEntry *parent, - const gchar *name); - -G_END_DECLS -#endif /* __VINAGRE_BOOKMARKS_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks-migration.c vinagre-2.29.1/src/vinagre-bookmarks-migration.c --- vinagre-2.26.1/src/vinagre-bookmarks-migration.c 2008-12-11 15:22:42.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks-migration.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,284 +0,0 @@ -/* - * vinagre-bookmarks-migration.c - * This file is part of vinagre - * - * Copyright (C) 2008 Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This is a temporary hack to migrate the bookmarks from an .ini format to - * a XML one. The new format is used in Vinagre 2.25. - */ - -#include -#include -#include -#include -#include - -#include "vinagre-bookmarks-entry.h" -#include "vinagre-connection.h" -#include "vinagre-bookmarks-migration.h" -#include "vinagre-bookmarks.h" - -static void -fill_xml (GSList *list, xmlTextWriter *writer) -{ - GSList *l; - VinagreBookmarksEntry *entry; - VinagreConnection *conn; - - for (l = list; l; l = l->next) - { - entry = (VinagreBookmarksEntry *) l->data; - switch (vinagre_bookmarks_entry_get_node (entry)) - { - case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: - xmlTextWriterStartElement (writer, "folder"); - xmlTextWriterWriteAttribute (writer, "name", vinagre_bookmarks_entry_get_name (entry)); - - fill_xml (vinagre_bookmarks_entry_get_children (entry), writer); - xmlTextWriterEndElement (writer); - break; - - case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: - conn = vinagre_bookmarks_entry_get_conn (entry); - - xmlTextWriterStartElement (writer, "item"); - xmlTextWriterWriteElement (writer, "name", vinagre_connection_get_name (conn)); - xmlTextWriterWriteElement (writer, "host", vinagre_connection_get_host (conn)); - xmlTextWriterWriteFormatElement (writer, "port", "%d", vinagre_connection_get_port (conn)); - xmlTextWriterWriteFormatElement (writer, "view_only", "%d", vinagre_connection_get_view_only (conn)); - xmlTextWriterWriteFormatElement (writer, "scaling", "%d", vinagre_connection_get_scaling (conn)); - xmlTextWriterWriteFormatElement (writer, "fullscreen", "%d", vinagre_connection_get_fullscreen (conn)); - - xmlTextWriterEndElement (writer); - break; - - default: - g_assert_not_reached (); - } - } -} - -static gboolean -save_to_file (GSList *entries, const gchar *filename) -{ - xmlTextWriter *writer; - xmlBuffer *buf; - int rc; - GError *error; - gboolean result; - - writer = NULL; - buf = NULL; - result = FALSE; - - buf = xmlBufferCreate (); - if (!buf) - { - g_warning (_("Error while migrating bookmarks: Failed to create the XML structure")); - return FALSE; - } - - writer = xmlNewTextWriterMemory(buf, 0); - if (!writer) - { - g_warning (_("Error while migrating bookmarks: Failed to create the XML structure")); - goto finalize; - } - - rc = xmlTextWriterStartDocument (writer, NULL, "utf-8", NULL); - if (rc < 0) - { - g_warning (_("Error while migrating bookmarks: Failed to initialize the XML structure")); - goto finalize; - } - - rc = xmlTextWriterStartElement (writer, "vinagre-bookmarks"); - if (rc < 0) - { - g_warning (_("Error while migrating bookmarks: Failed to initialize the XML structure")); - goto finalize; - } - - fill_xml (entries, writer); - - rc = xmlTextWriterEndDocument (writer); - if (rc < 0) - { - g_warning (_("Error while migrating bookmarks: Failed to finalize the XML structure")); - goto finalize; - } - - error = NULL; - if (!g_file_set_contents (filename, - (const char *) buf->content, - -1, - &error)) - { - g_warning (_("Error while migrating bookmarks: %s"), error?error->message:_("Unknown error")); - if (error) - g_error_free (error); - goto finalize; - } - - result = TRUE; - -finalize: - if (writer) - xmlFreeTextWriter (writer); - if (buf) - xmlBufferFree (buf); - - return result; -} - -static GSList * -create_list (GKeyFile *kf) -{ - GSList *entries; - gchar **conns; - gsize length, i; - - entries = NULL; - conns = g_key_file_get_groups (kf, &length); - for (i=0; imessage:_("Failed to create the directory")); - if (error) - g_error_free (error); - return; - } - - old = g_build_filename (g_get_user_data_dir (), - "vinagre", - VINAGRE_BOOKMARKS_FILE_OLD, - NULL); - if (!g_file_test (old, G_FILE_TEST_EXISTS)) - { - g_free (old); - old = g_build_filename (g_get_home_dir (), - ".gnome2", - VINAGRE_BOOKMARKS_FILE_OLD, - NULL); - if (!g_file_test (old, G_FILE_TEST_EXISTS)) - { - g_free (old); - return; - } - } - - g_message (_("Migrating the bookmarks file to the new format. This operation is only supposed to run once.")); - - kf = g_key_file_new (); - if (!g_key_file_load_from_file (kf, - old, - G_KEY_FILE_NONE, - &error)) - { - g_warning (_("Error opening old bookmarks file: %s"), error->message); - g_warning (_("Migration cancelled")); - g_error_free (error); - return; - } - - entries = create_list (kf); - if (save_to_file (entries, filename)) - { - if (g_unlink (old) != 0) - g_warning (_("Could not remove the old bookmarks file")); - } - else - g_warning (_("Migration cancelled")); - - g_slist_foreach (entries, (GFunc) g_object_unref, NULL); - g_slist_free (entries); - g_key_file_free (kf); - g_free (old); -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks-migration.h vinagre-2.29.1/src/vinagre-bookmarks-migration.h --- vinagre-2.26.1/src/vinagre-bookmarks-migration.h 2008-12-11 14:12:27.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks-migration.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -/* - * vinagre-bookmarks-migration.h - * This file is part of vinagre - * - * Copyright (C) 2008 Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This is a temporary hack to migrate the bookmarks from an .ini format to - * a XML one. The new format is used in Vinagre 2.25. - */ - -#ifndef __VINAGRE_BOOKMARKS_MIGRATION_H__ -#define __VINAGRE_BOOKMARKS_MIGRATION_H__ - -G_BEGIN_DECLS - -void vinagre_bookmarks_migration_migrate (const gchar *filename); - -G_END_DECLS - -#endif /* __VINAGRE_BOOKMARKS_MIGRATION_H__ */ - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks-tree.c vinagre-2.29.1/src/vinagre-bookmarks-tree.c --- vinagre-2.26.1/src/vinagre-bookmarks-tree.c 2008-12-11 19:12:49.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks-tree.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,292 +0,0 @@ -/* - * vinagre-bookmarks-tree.c - * This file is part of vinagre - * - * Copyright (C) Jonh Wendell 2008 - * - * vinagre 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 3 of the License, or - * (at your option) any later version. - * - * vinagre 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. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "vinagre-bookmarks-tree.h" -#include "vinagre-bookmarks-entry.h" -#include "vinagre-bookmarks.h" - -#include -#include - -struct _VinagreBookmarksTreePrivate -{ - GtkWidget *tree; -}; - -/* TreeModel */ -enum { - IMAGE_COL = 0, - NAME_COL, - ENTRY_COL, - NUM_COLS -}; - -G_DEFINE_TYPE (VinagreBookmarksTree, vinagre_bookmarks_tree, GTK_TYPE_VBOX); - -static void -vinagre_bookmarks_tree_row_activated_cb (GtkTreeView *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - VinagreBookmarksTree *tree) -{ - GtkTreeIter iter; - GtkTreeModel *model; - GtkWidget *toplevel; - - model = gtk_tree_view_get_model (treeview); - - gtk_tree_model_get_iter (model, &iter, path); - if (gtk_tree_model_iter_has_child (model, &iter)) - { - if (gtk_tree_view_row_expanded (treeview, path)) - gtk_tree_view_collapse_row (treeview, path); - else - gtk_tree_view_expand_row (treeview, path, FALSE); - return; - } - else - { - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (tree)); - if (GTK_IS_WINDOW (toplevel)) - gtk_window_activate_default (GTK_WINDOW (toplevel)); - } -} - -static void -vinagre_bookmarks_fill_tree (GSList *entries, GtkTreeStore *store, GtkTreeIter *parent, GdkPixbuf *pixbuf) -{ - GSList *l; - GtkTreeIter iter; - VinagreBookmarksEntry *entry; - - for (l = entries; l; l = l->next) - { - entry = VINAGRE_BOOKMARKS_ENTRY (l->data); - if (vinagre_bookmarks_entry_get_node (entry) != VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) - continue; - - gtk_tree_store_append (store, &iter, parent); - gtk_tree_store_set (store, &iter, - IMAGE_COL, pixbuf, - NAME_COL, vinagre_bookmarks_entry_get_name (entry), - ENTRY_COL, entry, - -1); - vinagre_bookmarks_fill_tree (vinagre_bookmarks_entry_get_children (entry), - store, - &iter, - pixbuf); - } -} - -static gboolean -vinagre_bookmarks_tree_update_list (VinagreBookmarksTree *tree) -{ - GtkTreeStore *model; - GtkTreeIter iter; - GdkPixbuf *pixbuf; - GtkIconTheme *icon_theme; - GtkTreeSelection *selection; - GtkTreePath *path; - - icon_theme = gtk_icon_theme_get_default (); - pixbuf = gtk_icon_theme_load_icon (icon_theme, - "folder", - 16, - 0, - NULL); - - model = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (tree->priv->tree))); - - gtk_tree_store_append (model, &iter, NULL); - gtk_tree_store_set (model, &iter, - IMAGE_COL, pixbuf, - NAME_COL, _("Root Folder"), - -1); - - vinagre_bookmarks_fill_tree (vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()), - model, - NULL, - pixbuf); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree->priv->tree)); - gtk_tree_selection_select_iter (selection, &iter); - - g_object_unref (pixbuf); - return FALSE; -} - -static void -vinagre_bookmarks_tree_init (VinagreBookmarksTree *tree) -{ - GtkCellRenderer *cell; - GtkWidget *scroll; - GtkTreeSelection *selection; - GtkTreeStore *model; - GtkTreeViewColumn *main_column; - - tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree, VINAGRE_TYPE_BOOKMARKS_TREE, VinagreBookmarksTreePrivate); - - /* Create the scrolled window */ - scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), - GTK_SHADOW_ETCHED_OUT); - gtk_widget_set_size_request (scroll, 200, 180); - gtk_box_pack_start (GTK_BOX (tree), scroll, TRUE, TRUE, 0); - - /* Create the model */ - model = gtk_tree_store_new (NUM_COLS, - GDK_TYPE_PIXBUF, - G_TYPE_STRING, - VINAGRE_TYPE_BOOKMARKS_ENTRY); - - tree->priv->tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree->priv->tree), FALSE); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree->priv->tree)); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - g_object_unref (model); - - main_column = gtk_tree_view_column_new (); - gtk_tree_view_column_set_clickable (main_column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree->priv->tree), main_column); - - /* Set up the pixbuf column */ - cell = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (main_column, cell, FALSE); - gtk_tree_view_column_add_attribute (main_column, cell, "pixbuf", IMAGE_COL); - - /* Set up the name column */ - cell = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (main_column, cell, TRUE); - gtk_tree_view_column_add_attribute (main_column, cell, "text", NAME_COL); - - g_signal_connect (tree->priv->tree, - "row-activated", - G_CALLBACK (vinagre_bookmarks_tree_row_activated_cb), - tree); - - vinagre_bookmarks_tree_update_list (tree); - - gtk_container_add (GTK_CONTAINER(scroll), tree->priv->tree); - gtk_widget_show (tree->priv->tree); -} - -static void -vinagre_bookmarks_tree_class_init (VinagreBookmarksTreeClass *klass) -{ - GObjectClass* object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (object_class, sizeof (VinagreBookmarksTreePrivate)); -} - -GtkWidget * -vinagre_bookmarks_tree_new (void) -{ - return GTK_WIDGET (g_object_new (VINAGRE_TYPE_BOOKMARKS_TREE, NULL)); -} - -VinagreBookmarksEntry * -vinagre_bookmarks_tree_get_selected_entry (VinagreBookmarksTree *tree) -{ - GtkTreeSelection *selection; - GtkTreeIter iter; - GtkTreeModel *model; - VinagreBookmarksEntry *entry; - - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_TREE (tree), NULL); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree->priv->tree)); - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) - { - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree->priv->tree)); - gtk_tree_model_get (model, - &iter, - ENTRY_COL, &entry, - -1); - return entry; - } - else - return NULL; -} - -struct _find_entry -{ - VinagreBookmarksEntry *entry; - gboolean found; - GtkTreePath *path; -}; - -static gboolean -find_entry (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data) -{ - VinagreBookmarksEntry *entry; - struct _find_entry *f = data; - - gtk_tree_model_get (model, - iter, - ENTRY_COL, &entry, - -1); - if (entry == f->entry) - { - f->found = TRUE; - f->path = gtk_tree_path_copy (path); - return TRUE; - } - - return FALSE; -} - -gboolean -vinagre_bookmarks_tree_select_entry (VinagreBookmarksTree *tree, - VinagreBookmarksEntry *entry) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreePath *path; - gboolean valid; - struct _find_entry f; - - if (!entry) - return FALSE; - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_TREE (tree), FALSE); - g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), FALSE); - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree->priv->tree)); - f.entry = entry; - f.found = FALSE; - - gtk_tree_model_foreach (model, find_entry, &f); - if (f.found) - { - gtk_tree_view_expand_to_path (GTK_TREE_VIEW (tree->priv->tree), f.path); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (tree->priv->tree), f.path, NULL, FALSE); - gtk_tree_path_free (f.path); - return TRUE; - } - else - return FALSE; -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks-tree.h vinagre-2.29.1/src/vinagre-bookmarks-tree.h --- vinagre-2.26.1/src/vinagre-bookmarks-tree.h 2008-12-08 17:39:47.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks-tree.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ -/* - * vinagre-bookmarks-tree.h - * This file is part of vinagre - * - * Copyright (C) Jonh Wendell 2008 - * - * vinagre 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 3 of the License, or - * (at your option) any later version. - * - * vinagre 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. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef _VINAGRE_BOOKMARKS_TREE_H_ -#define _VINAGRE_BOOKMARKS_TREE_H_ - -#include -#include -#include "vinagre-bookmarks-entry.h" - -G_BEGIN_DECLS - -#define VINAGRE_TYPE_BOOKMARKS_TREE (vinagre_bookmarks_tree_get_type ()) -#define VINAGRE_BOOKMARKS_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_BOOKMARKS_TREE, VinagreBookmarksTree)) -#define VINAGRE_BOOKMARKS_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_BOOKMARKS_TREE, VinagreBookmarksTreeClass)) -#define VINAGRE_IS_BOOKMARKS_TREE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_BOOKMARKS_TREE)) -#define VINAGRE_IS_BOOKMARKS_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_BOOKMARKS_TREE)) -#define VINAGRE_BOOKMARKS_TREE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_BOOKMARKS_TREE, VinagreBookmarksTreeClass)) - -typedef struct _VinagreBookmarksTreeClass VinagreBookmarksTreeClass; -typedef struct _VinagreBookmarksTree VinagreBookmarksTree; -typedef struct _VinagreBookmarksTreePrivate VinagreBookmarksTreePrivate; - -struct _VinagreBookmarksTreeClass -{ - GtkVBoxClass parent_class; -}; - -struct _VinagreBookmarksTree -{ - GtkVBox parent_instance; - VinagreBookmarksTreePrivate *priv; -}; - -GType vinagre_bookmarks_tree_get_type (void) G_GNUC_CONST; - -GtkWidget* vinagre_bookmarks_tree_new (void); -gboolean vinagre_bookmarks_tree_select_entry (VinagreBookmarksTree *tree, - VinagreBookmarksEntry *entry); -VinagreBookmarksEntry* vinagre_bookmarks_tree_get_selected_entry (VinagreBookmarksTree *tree); - -G_END_DECLS - -#endif /* _VINAGRE_BOOKMARKS_TREE_H_ */ - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks-ui.c vinagre-2.29.1/src/vinagre-bookmarks-ui.c --- vinagre-2.26.1/src/vinagre-bookmarks-ui.c 2009-03-20 15:31:44.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks-ui.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,341 +0,0 @@ -/* - * vinagre-bookmarks-ui.c - * This file is part of vinagre - * - * Copyright (C) 2008 Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include - -#include "vinagre-bookmarks-ui.h" -#include "vinagre-utils.h" -#include "vinagre-bookmarks-tree.h" - -static void -control_save_button_visibility (GtkEntry *ed, GtkWidget *bt) -{ - gtk_widget_set_sensitive (bt, - gtk_entry_get_text_length (ed) > 0); -} - -static void -show_dialog_folder (VinagreBookmarks *book, - GtkWindow *window, - VinagreBookmarksEntry *entry, - gboolean is_add) -{ - GladeXML *xml; - GtkWidget *dialog, *box, *tree, *name_entry, *save_button; - const gchar *name; - - xml = glade_xml_new (vinagre_utils_get_glade_filename (), - "bookmarks_add_edit_folder_dialog", - NULL); - dialog = glade_xml_get_widget (xml, "bookmarks_add_edit_folder_dialog"); - name_entry = glade_xml_get_widget (xml, "edit_bookmark_folder_name_entry"); - box = glade_xml_get_widget (xml, "folder_box1"); - save_button= glade_xml_get_widget (xml, "save_button"); - - gtk_window_set_transient_for (GTK_WINDOW (dialog), window); - gtk_entry_set_text (GTK_ENTRY (name_entry), vinagre_bookmarks_entry_get_name (entry)); - gtk_editable_set_position (GTK_EDITABLE (name_entry), -1); - g_signal_connect (name_entry, "changed", G_CALLBACK (control_save_button_visibility), save_button); - - tree = vinagre_bookmarks_tree_new (); - vinagre_bookmarks_tree_select_entry (VINAGRE_BOOKMARKS_TREE (tree), - vinagre_bookmarks_entry_get_parent (entry)); - gtk_box_pack_end (GTK_BOX (box), tree, TRUE, TRUE, 0); - - gtk_widget_show_all (dialog); - while (TRUE) - { - VinagreBookmarksEntry *existing_entry; - - if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) - { - if (is_add) - g_object_unref (entry); - goto finalize; - } - - name = gtk_entry_get_text (GTK_ENTRY (name_entry)); - if (strlen (name) < 1) - { - vinagre_utils_show_error (NULL, _("Invalid name for this folder"), GTK_WINDOW (dialog)); - gtk_widget_grab_focus (name_entry); - continue; - } - - existing_entry = vinagre_bookmarks_name_exists (book, - vinagre_bookmarks_tree_get_selected_entry (VINAGRE_BOOKMARKS_TREE (tree)), - name); - if (existing_entry && existing_entry != entry) - { - gchar *str = g_strdup_printf (_("The name \"%s\" is already used in this folder. Please use a different name."), name); - vinagre_utils_show_error (_("Invalid name for this item"), - str, - GTK_WINDOW (dialog)); - g_free (str); - gtk_widget_grab_focus (name_entry); - continue; - } - - break; - } - - vinagre_bookmarks_entry_set_name (entry, name); - if (!is_add) - { - g_object_ref (entry); - vinagre_bookmarks_remove_entry (book, entry); - } - vinagre_bookmarks_add_entry ( book, - entry, - vinagre_bookmarks_tree_get_selected_entry (VINAGRE_BOOKMARKS_TREE (tree))); - -finalize: - gtk_widget_destroy (GTK_WIDGET (dialog)); - g_object_unref (G_OBJECT (xml)); -} - -static void -show_dialog_conn (VinagreBookmarks *book, - GtkWindow *window, - VinagreBookmarksEntry *entry, - gboolean is_add) -{ - gchar *str, *host, *error_str; - gint port; - GladeXML *xml; - GtkWidget *dialog, *host_entry, *name_entry; - GtkWidget *fs_check, *sc_check, *vo_check; - GtkWidget *box, *tree, *save_button; - VinagreConnection *conn; - const gchar *name; - - xml = glade_xml_new (vinagre_utils_get_glade_filename (), - "bookmarks_add_edit_conn_dialog", - NULL); - dialog = glade_xml_get_widget (xml, "bookmarks_add_edit_conn_dialog"); - name_entry = glade_xml_get_widget (xml, "edit_bookmark_name_entry"); - host_entry = glade_xml_get_widget (xml, "edit_bookmark_host_entry"); - fs_check = glade_xml_get_widget (xml, "edit_fullscreen_check"); - sc_check = glade_xml_get_widget (xml, "edit_scaling_check"); - vo_check = glade_xml_get_widget (xml, "edit_viewonly_check"); - box = glade_xml_get_widget (xml, "folder_box"); - save_button= glade_xml_get_widget (xml, "save_button"); - - gtk_window_set_transient_for (GTK_WINDOW (dialog), window); - conn = vinagre_bookmarks_entry_get_conn (entry); - - str = vinagre_connection_get_best_name (conn); - gtk_entry_set_text (GTK_ENTRY (name_entry), str); - gtk_editable_set_position (GTK_EDITABLE (name_entry), -1); - g_free (str); - - str = vinagre_connection_get_string_rep (conn, FALSE); - gtk_entry_set_text (GTK_ENTRY (host_entry), str); - g_free (str); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fs_check), - vinagre_connection_get_fullscreen (conn)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sc_check), - vinagre_connection_get_scaling (conn)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (vo_check), - vinagre_connection_get_view_only (conn)); - - g_signal_connect (name_entry, "changed", G_CALLBACK (control_save_button_visibility), save_button); - - tree = vinagre_bookmarks_tree_new (); - vinagre_bookmarks_tree_select_entry (VINAGRE_BOOKMARKS_TREE (tree), - vinagre_bookmarks_entry_get_parent (entry)); - gtk_box_pack_end (GTK_BOX (box), tree, TRUE, TRUE, 0); - - gtk_widget_show_all (dialog); - - while (TRUE) - { - VinagreBookmarksEntry *existing_entry; - - if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) - goto finalize; - - name = gtk_entry_get_text (GTK_ENTRY (name_entry)); - if (strlen (name) < 1) - { - vinagre_utils_show_error (NULL, _("Invalid name for this item"), GTK_WINDOW (dialog)); - gtk_widget_grab_focus (name_entry); - continue; - } - - existing_entry = vinagre_bookmarks_name_exists (book, - vinagre_bookmarks_tree_get_selected_entry (VINAGRE_BOOKMARKS_TREE (tree)), - name); - if (existing_entry && existing_entry != entry) - { - gchar *str = g_strdup_printf (_("The name \"%s\" is already used in this folder. Please use a different name."), name); - vinagre_utils_show_error (_("Invalid name for this item"), - str, - GTK_WINDOW (dialog)); - g_free (str); - gtk_widget_grab_focus (name_entry); - continue; - } - - if (!vinagre_connection_split_string (gtk_entry_get_text (GTK_ENTRY (host_entry)), - &host, - &port, - &error_str)) - { - vinagre_utils_show_error (NULL, error_str, GTK_WINDOW (dialog)); - g_free (error_str); - gtk_widget_grab_focus (host_entry); - continue; - } - - break; - } - - vinagre_connection_set_name (conn, name); - vinagre_connection_set_host (conn, host); - vinagre_connection_set_port (conn, port); - vinagre_connection_set_view_only (conn, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (vo_check))); - vinagre_connection_set_scaling (conn, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (sc_check))); - vinagre_connection_set_fullscreen (conn, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fs_check))); - - if (!is_add) - { - g_object_ref (entry); - vinagre_bookmarks_remove_entry (book, entry); - } - vinagre_bookmarks_add_entry ( book, - entry, - vinagre_bookmarks_tree_get_selected_entry (VINAGRE_BOOKMARKS_TREE (tree))); - -finalize: - gtk_widget_destroy (GTK_WIDGET (dialog)); - g_object_unref (G_OBJECT (xml)); -} - -void -vinagre_bookmarks_add (VinagreBookmarks *book, - VinagreConnection *conn, - GtkWindow *window) -{ - VinagreBookmarksEntry *entry; - - g_return_if_fail (VINAGRE_IS_BOOKMARKS (book)); - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - entry = vinagre_bookmarks_entry_new_conn (conn); - show_dialog_conn (book, window, entry, TRUE); -} - -void -vinagre_bookmarks_edit (VinagreBookmarks *book, - VinagreBookmarksEntry *entry, - GtkWindow *window) -{ - g_return_if_fail (VINAGRE_IS_BOOKMARKS (book)); - g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); - - g_object_ref (entry); - - switch (vinagre_bookmarks_entry_get_node (entry)) - { - case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: - show_dialog_folder (book, window, entry, FALSE); - break; - - case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: - show_dialog_conn (book, window, entry, FALSE); - break; - - default: - g_assert_not_reached (); - } - - g_object_unref (entry); -} - -void -vinagre_bookmarks_del (VinagreBookmarks *book, - VinagreBookmarksEntry *entry, - GtkWindow *window) -{ - GtkWidget *dialog; - gchar *name, *title, *msg1, *msg2; - GError *error = NULL; - GSList *parent; - - g_return_if_fail (VINAGRE_IS_BOOKMARKS (book)); - g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); - - msg1 = g_strdup (_("Are you sure you want to remove %s from bookmarks?")); - - if (vinagre_bookmarks_entry_get_node (entry) == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) - { - name = g_strdup (vinagre_bookmarks_entry_get_name (entry)); - title = g_strdup (_("Remove Folder?")); - msg2 = g_strdup_printf ("%s\n\n%s", msg1, _("Notice that all its subfolders and items will be removed as well.")); - } - else - { - name = vinagre_connection_get_best_name (vinagre_bookmarks_entry_get_conn (entry)); - title = g_strdup (_("Remove Item?")); - msg2 = g_strdup (msg1); - } - - dialog = gtk_message_dialog_new (window, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_OK_CANCEL, - "%s", - title); - - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - msg2, - name); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) - if (!vinagre_bookmarks_remove_entry (book, entry)) - g_warning (_("Error removing bookmark: Entry not found")); - - gtk_widget_destroy (dialog); - g_free (name); - g_free (title); - g_free (msg1); - g_free (msg2); -} - -void -vinagre_bookmarks_new_folder (VinagreBookmarks *book, - GtkWindow *window) -{ - VinagreBookmarksEntry *entry; - - g_return_if_fail (VINAGRE_IS_BOOKMARKS (book)); - - entry = vinagre_bookmarks_entry_new_folder (_("New Folder")); - show_dialog_folder (book, window, entry, TRUE); -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-bookmarks-ui.h vinagre-2.29.1/src/vinagre-bookmarks-ui.h --- vinagre-2.26.1/src/vinagre-bookmarks-ui.h 2008-12-11 16:47:47.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-bookmarks-ui.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -/* - * vinagre-bookmarks-ui.h - * This file is part of vinagre - * - * Copyright (C) 2008 Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_BOOKMARKS_UI_H__ -#define __VINAGRE_BOOKMARKS_UI_H__ - -#include -#include - -#include "vinagre-connection.h" -#include "vinagre-bookmarks.h" -#include "vinagre-bookmarks-entry.h" -#include "vinagre-window.h" - -G_BEGIN_DECLS - -void vinagre_bookmarks_add (VinagreBookmarks *book, - VinagreConnection *conn, - GtkWindow *window); -void vinagre_bookmarks_del (VinagreBookmarks *book, - VinagreBookmarksEntry *entry, - GtkWindow *window); -void vinagre_bookmarks_edit (VinagreBookmarks *book, - VinagreBookmarksEntry *entry, - GtkWindow *window); -void vinagre_bookmarks_new_folder (VinagreBookmarks *book, - GtkWindow *window); - -G_END_DECLS - -#endif /* __VINAGRE_BOOKMARKS_UI_H__ */ - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-commands.c vinagre-2.29.1/src/vinagre-commands.c --- vinagre-2.26.1/src/vinagre-commands.c 2008-12-11 16:56:43.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-commands.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,423 +0,0 @@ -/* - * vinagre-commands.c - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include - -#include "vinagre-commands.h" -#include "vinagre-utils.h" -#include "vinagre-connection.h" -#include "vinagre-notebook.h" -#include "vinagre-tab.h" -#include "vinagre-connect.h" -#include "vinagre-bookmarks.h" -#include "vinagre-bookmarks-ui.h" -#include "vinagre-fav.h" -#include "vinagre-window-private.h" -#include "vinagre-prefs.h" - -void -vinagre_cmd_direct_connect (VinagreConnection *conn, - VinagreWindow *window) -{ - VinagreTab *tab; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - tab = vinagre_window_conn_exists (window, conn); - if (tab) - { - vinagre_window_set_active_tab (window, tab); - } - else - { - tab = VINAGRE_TAB (vinagre_tab_new (conn, window)); - vinagre_notebook_add_tab (VINAGRE_NOTEBOOK (window->priv->notebook), - VINAGRE_TAB (tab), - -1); - } -} - -/* Machine Menu */ -void -vinagre_cmd_machine_connect (GtkAction *action, - VinagreWindow *window) -{ - VinagreTab *tab; - VinagreConnection *conn; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - conn = vinagre_connect (window); - if (!conn) - return; - - tab = vinagre_window_conn_exists (window, conn); - if (tab) - { - vinagre_window_set_active_tab (window, tab); - } - else - { - tab = VINAGRE_TAB (vinagre_tab_new (conn, window)); - vinagre_notebook_add_tab (VINAGRE_NOTEBOOK (window->priv->notebook), - VINAGRE_TAB (tab), - -1); - } -} - -static void -vinagre_cmd_free_string_list (gpointer str, gpointer user_data) -{ - g_free (str); -} - -void -vinagre_cmd_machine_open (GtkAction *action, - VinagreWindow *window) -{ - GtkWidget *tab; - VinagreConnection *conn; - GtkWidget *dialog; - GtkFileFilter *filter; - GSList *files, *l; - gchar *uri; - gchar *error = NULL; - GSList *errors = NULL; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - dialog = gtk_file_chooser_dialog_new (_("Choose the file"), - GTK_WINDOW (window), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL); - - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); - gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); - - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("Supported formats")); - gtk_file_filter_add_pattern (filter, "*.vnc"); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - files = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog)); - for (l = files; l; l = l->next) - { - uri = (gchar *)l->data; - conn = vinagre_connection_new_from_file (uri, &error, FALSE); - - if (conn) - { - tab = vinagre_tab_new (conn, window); - vinagre_notebook_add_tab (VINAGRE_NOTEBOOK (window->priv->notebook), - VINAGRE_TAB (tab), - -1); - } - else - { - errors = g_slist_append (errors, g_strdup_printf ("%s: %s", uri, error?error:_("Unknown error"))); - g_free (error); - } - - g_free (uri); - } - g_slist_free (files); - } - - if (errors) - { - vinagre_utils_show_many_errors (ngettext ("The following file could not be opened:", - "The following files could not be opened:", - g_slist_length (errors)), - errors, - GTK_WINDOW (window)); - g_slist_foreach (errors, vinagre_cmd_free_string_list, NULL); - g_slist_free (errors); - } - - gtk_widget_destroy (dialog); -} - -void -vinagre_cmd_machine_close (GtkAction *action, - VinagreWindow *window) -{ - vinagre_window_close_active_tab (window); -} - -void -vinagre_cmd_machine_take_screenshot (GtkAction *action, - VinagreWindow *window) -{ - vinagre_tab_take_screenshot (vinagre_window_get_active_tab (window)); -} - -void -vinagre_cmd_machine_send_ctrlaltdel (GtkAction *action, - VinagreWindow *window) -{ - vinagre_tab_send_ctrlaltdel (vinagre_window_get_active_tab (window)); -} - -void -vinagre_cmd_machine_close_all (GtkAction *action, - VinagreWindow *window) -{ - vinagre_window_close_all_tabs (window); -} - -void -vinagre_cmd_machine_quit (GtkAction *action, - VinagreWindow *window) -{ - gtk_widget_destroy (GTK_WIDGET (window)); -} - -/* Edit Menu */ -void -vinagre_cmd_edit_preferences (GtkAction *action, - VinagreWindow *window) -{ - vinagre_prefs_dialog_show (window); -} - -/* View Menu */ -void -vinagre_cmd_view_show_toolbar (GtkAction *action, - VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - vinagre_utils_toggle_widget_visible (window->priv->toolbar); - - g_object_set (vinagre_prefs_get_default (), - "toolbar-visible", GTK_WIDGET_VISIBLE (window->priv->toolbar), - NULL); -} - -void -vinagre_cmd_view_show_statusbar (GtkAction *action, - VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - vinagre_utils_toggle_widget_visible (window->priv->statusbar); - - g_object_set (vinagre_prefs_get_default (), - "statusbar-visible", GTK_WIDGET_VISIBLE (window->priv->statusbar), - NULL); -} - -void -vinagre_cmd_view_show_fav_panel (GtkAction *action, - VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - vinagre_utils_toggle_widget_visible (window->priv->fav_panel); - - g_object_set (vinagre_prefs_get_default (), - "side-panel-visible", GTK_WIDGET_VISIBLE (window->priv->fav_panel), - NULL); -} - -void -vinagre_cmd_view_fullscreen (GtkAction *action, - VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - vinagre_window_toggle_fullscreen (window); -} - -void -vinagre_cmd_view_original_size (GtkAction *action, - VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - vinagre_tab_original_size (vinagre_window_get_active_tab (window)); -} - -void -vinagre_cmd_view_scaling (GtkAction *action, - VinagreWindow *window) -{ - gboolean active; - VinagreTab *tab; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - tab = vinagre_window_get_active_tab (window); - if (!tab) - return; - - active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - - if (!vinagre_tab_set_scaling (tab, active)) - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE); -} - -void -vinagre_cmd_view_readonly (GtkAction *action, - VinagreWindow *window) -{ - gboolean active; - VinagreTab *tab; - - tab = vinagre_window_get_active_tab (window); - if (!tab) - return; - - active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - vinagre_tab_set_readonly (tab, active); -} - -/* Bookmarks Menu */ -void -vinagre_cmd_open_bookmark (VinagreWindow *window, - VinagreConnection *conn) -{ - VinagreTab *tab; - VinagreConnection *new_conn; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - tab = vinagre_window_conn_exists (window, conn); - if (tab) - { - vinagre_window_set_active_tab (window, tab); - } - else - { - new_conn = vinagre_connection_clone (conn); - tab = VINAGRE_TAB (vinagre_tab_new (new_conn, window)); - vinagre_notebook_add_tab (VINAGRE_NOTEBOOK (window->priv->notebook), - VINAGRE_TAB (tab), - -1); - } -} - -void -vinagre_cmd_bookmarks_add (GtkAction *action, - VinagreWindow *window) -{ - GtkWidget *tab; - VinagreConnection *conn; - gchar *name; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - tab = window->priv->active_tab; - conn = vinagre_tab_get_conn (VINAGRE_TAB (tab)); - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - vinagre_bookmarks_add (vinagre_bookmarks_get_default (), - conn, - GTK_WINDOW (window)); - - if (window->priv->active_tab == tab) - { - name = vinagre_connection_get_best_name (conn); - vinagre_tab_set_title (VINAGRE_TAB (window->priv->active_tab), - name); - g_free (name); - } -} - -void -vinagre_cmd_bookmarks_new_folder (GtkAction *action, - VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - vinagre_bookmarks_new_folder (vinagre_bookmarks_get_default (), - GTK_WINDOW (window)); -} - -void -vinagre_cmd_bookmarks_edit (GtkAction *action, - VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (window->priv->fav_entry_selected)); - - vinagre_bookmarks_edit (vinagre_bookmarks_get_default (), - window->priv->fav_entry_selected, - GTK_WINDOW (window)); -} - -void -vinagre_cmd_bookmarks_del (GtkAction *action, - VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (window->priv->fav_entry_selected)); - - vinagre_bookmarks_del (vinagre_bookmarks_get_default (), - window->priv->fav_entry_selected, - GTK_WINDOW (window)); -} - -void -vinagre_cmd_bookmarks_open (GtkAction *action, - VinagreWindow *window) -{ - VinagreConnection *conn; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - conn = g_object_get_data (G_OBJECT (action), "conn"); - if (!conn) - conn = vinagre_bookmarks_entry_get_conn (window->priv->fav_entry_selected); - - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - vinagre_cmd_open_bookmark (window, conn); -} - -/* Help Menu */ - -void -vinagre_cmd_help_contents (GtkAction *action, - VinagreWindow *window) -{ - vinagre_utils_help_contents (GTK_WINDOW (window)); -} - -void -vinagre_cmd_help_about (GtkAction *action, - VinagreWindow *window) -{ - vinagre_utils_help_about (GTK_WINDOW (window)); -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-commands.h vinagre-2.29.1/src/vinagre-commands.h --- vinagre-2.26.1/src/vinagre-commands.h 2008-12-11 16:43:56.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-commands.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -/* - * vinagre-commands.h - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_COMMANDS_H__ -#define __VINAGRE_COMMANDS_H__ - -#include -#include "vinagre-window.h" -#include "vinagre-connection.h" - -G_BEGIN_DECLS - -void vinagre_cmd_direct_connect (VinagreConnection *conn, - VinagreWindow *window); - -void vinagre_cmd_machine_connect (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_machine_open (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_machine_close (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_machine_take_screenshot (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_machine_send_ctrlaltdel (GtkAction *action, - VinagreWindow *window); - -void vinagre_cmd_machine_close_all (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_machine_quit (GtkAction *action, - VinagreWindow *window); - -void vinagre_cmd_edit_preferences (GtkAction *action, - VinagreWindow *window); - -void vinagre_cmd_view_show_toolbar (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_view_show_statusbar (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_view_show_fav_panel (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_view_scaling (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_view_original_size (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_view_fullscreen (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_view_readonly (GtkAction *action, - VinagreWindow *window); - -void vinagre_cmd_open_bookmark (VinagreWindow *window, - VinagreConnection *conn); -void vinagre_cmd_bookmarks_add (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_bookmarks_open (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_bookmarks_new_folder(GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_bookmarks_edit (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_bookmarks_del (GtkAction *action, - VinagreWindow *window); - -void vinagre_cmd_help_contents (GtkAction *action, - VinagreWindow *window); -void vinagre_cmd_help_about (GtkAction *action, - VinagreWindow *window); - - - -G_END_DECLS - -#endif /* __VINAGRE_COMMANDS_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-connect.c vinagre-2.29.1/src/vinagre-connect.c --- vinagre-2.26.1/src/vinagre-connect.c 2009-02-20 18:14:30.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-connect.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,289 +0,0 @@ -/* - * vinagre-connect.c - * This file is part of vinagre - * - * Copyright (C) 2007 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include - -#ifdef VINAGRE_ENABLE_AVAHI -#include -#endif - -#include "vinagre-connect.h" -#include "vinagre-utils.h" -#include "vinagre-bookmarks.h" -#include "vinagre-prefs.h" - -typedef struct { - GladeXML *xml; - GtkWidget *dialog; - GtkWidget *host_entry; - GtkWidget *find_button; - GtkWidget *fullscreen_check; - GtkWidget *scaling_check; - GtkWidget *viewonly_check; -} VinagreConnectDialog; - -enum { - COLUMN_TEXT, - N_COLUMNS -}; - -static gchar* -history_filename () { - return g_build_filename (g_get_user_data_dir (), - "vinagre", - "history", - NULL); -} - -static GPtrArray * -saved_history (void) -{ - gchar *filename, *file_contents = NULL; - gchar **history_from_file = NULL, **list; - gboolean success; - gint len; - GPtrArray *array; - - array = g_ptr_array_new (); - - filename = history_filename (); - success = g_file_get_contents (filename, - &file_contents, - NULL, - NULL); - - if (success) - { - history_from_file = g_strsplit (file_contents, "\n", 0); - len = g_strv_length (history_from_file); - if (strlen (history_from_file[len-1]) == 0) - { - g_free (history_from_file[len-1]); - history_from_file[len-1] = NULL; - } - - list = history_from_file; - - while (*list != NULL) - g_ptr_array_add (array, *list++); - } - - g_free (filename); - g_free (file_contents); - return array; -} - -static void -setup_combo (GtkWidget *combo) -{ - GtkListStore *store; - GtkTreeIter iter; - GtkEntryCompletion *completion; - GPtrArray *history; - gint i, size; - - store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING); - - history = saved_history (); - - g_object_get (vinagre_prefs_get_default (), "history-size", &size, NULL); - if (size <= 0) - size = G_MAXINT; - - for (i=history->len-1; i>=0 && i>=(gint)history->len-size; i--) - { - GtkTreeIter iter; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, COLUMN_TEXT, g_ptr_array_index (history, i), -1); - } - g_ptr_array_free (history, TRUE); - - gtk_combo_box_set_model (GTK_COMBO_BOX (combo), - GTK_TREE_MODEL (store)); - gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo), - 0); - - completion = gtk_entry_completion_new (); - gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (store)); - gtk_entry_completion_set_text_column (completion, 0); - gtk_entry_completion_set_inline_completion (completion, TRUE); - gtk_entry_set_completion (GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo))), completion); - g_object_unref (completion); - - gtk_entry_set_activates_default (GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo))), TRUE); -} - -void -save_history (GtkWidget *combo) { - gchar *host; - GPtrArray *history; - guint i; - gchar *filename, *path; - GString *content; - GError *error = NULL; - - host = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo)); - - history = saved_history (); - for (i=0; ilen; i++) - if (!g_strcmp0 (g_ptr_array_index (history, i), host)) - { - g_ptr_array_remove_index (history, i); - break; - } - - g_ptr_array_add (history, host); - content = g_string_new (NULL); - - for (i=0; ilen; i++) - g_string_append_printf (content, "%s\n", (char *) g_ptr_array_index (history, i)); - - filename = history_filename (); - path = g_path_get_dirname (filename); - g_mkdir_with_parents (path, 0755); - - g_file_set_contents (filename, - content->str, - -1, - &error); - - g_free (filename); - g_free (path); - g_ptr_array_free (history, TRUE); - g_string_free (content, TRUE); - - if (error) { - g_warning (_("Error while saving history file: %s"), error->message); - g_error_free (error); - } -} - -#ifdef VINAGRE_ENABLE_AVAHI -static void -vinagre_connect_find_button_cb (GtkButton *button, - VinagreConnectDialog *dialog) -{ - GtkWidget *d; - - d = aui_service_dialog_new (_("Choose a VNC Server"), - GTK_WINDOW(dialog->dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL); - gtk_window_set_transient_for (GTK_WINDOW(d), GTK_WINDOW(dialog->dialog)); - aui_service_dialog_set_resolve_service (AUI_SERVICE_DIALOG(d), TRUE); - aui_service_dialog_set_resolve_host_name (AUI_SERVICE_DIALOG(d), TRUE); - aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG(d), - "_rfb._tcp", - NULL); - - if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_ACCEPT) - { - gchar *tmp; - - tmp = g_strdup_printf ("%s::%d", - aui_service_dialog_get_host_name(AUI_SERVICE_DIALOG(d)), - aui_service_dialog_get_port(AUI_SERVICE_DIALOG(d))); - - gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (dialog->host_entry))), - tmp); - - g_free (tmp); - } - - gtk_widget_destroy (d); -} -#endif - -VinagreConnection *vinagre_connect (VinagreWindow *window) -{ - VinagreConnection *conn = NULL; - gint result; - VinagreConnectDialog dialog; - - dialog.xml = glade_xml_new (vinagre_utils_get_glade_filename (), NULL, NULL); - dialog.dialog = glade_xml_get_widget (dialog.xml, "connect_dialog"); - gtk_window_set_transient_for (GTK_WINDOW (dialog.dialog), GTK_WINDOW (window)); - - dialog.host_entry = glade_xml_get_widget (dialog.xml, "host_entry"); - dialog.find_button = glade_xml_get_widget (dialog.xml, "find_button"); - dialog.fullscreen_check = glade_xml_get_widget (dialog.xml, "fullscreen_check"); - dialog.viewonly_check = glade_xml_get_widget (dialog.xml, "viewonly_check"); - dialog.scaling_check = glade_xml_get_widget (dialog.xml, "scaling_check"); - - setup_combo (dialog.host_entry); - -#ifdef VINAGRE_ENABLE_AVAHI - g_signal_connect (dialog.find_button, - "clicked", - G_CALLBACK (vinagre_connect_find_button_cb), - &dialog); -#else - gtk_widget_hide (dialog.find_button); - gtk_widget_set_no_show_all (dialog.find_button, TRUE); -#endif - - gtk_widget_show_all (dialog.dialog); - result = gtk_dialog_run (GTK_DIALOG (dialog.dialog)); - - if (result == GTK_RESPONSE_OK) - { - gchar *host = NULL, *error_msg = NULL; - - host = gtk_combo_box_get_active_text (GTK_COMBO_BOX (dialog.host_entry)); - gtk_widget_hide (GTK_WIDGET (dialog.dialog)); - - if (!host || !g_strcmp0 (host, "")) - goto fail; - - save_history (dialog.host_entry); - - conn = vinagre_connection_new_from_string (host, &error_msg, TRUE); - if (conn) - { - g_object_set (conn, - "scaling", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog.scaling_check)), - "view-only", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog.viewonly_check)), - "fullscreen", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog.fullscreen_check)), - NULL); - } - else - { - vinagre_utils_show_error (NULL, error_msg ? error_msg : _("Unknown error"), - GTK_WINDOW (window)); - } -fail: - g_free (host); - g_free (error_msg); - } - - gtk_widget_destroy (dialog.dialog); - g_object_unref (dialog.xml); - return conn; -} -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-connect.h vinagre-2.29.1/src/vinagre-connect.h --- vinagre-2.26.1/src/vinagre-connect.h 2008-02-15 18:43:05.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-connect.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -/* - * vinagre-connect.h - * This file is part of vinagre - * - * Copyright (C) 2007 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "vinagre-window.h" - -VinagreConnection *vinagre_connect (VinagreWindow *window); diff -Nru vinagre-2.26.1/src/vinagre-connection.c vinagre-2.29.1/src/vinagre-connection.c --- vinagre-2.26.1/src/vinagre-connection.c 2009-02-19 20:11:18.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-connection.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,890 +0,0 @@ -/* - * vinagre-connection.c - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include - -#include "vinagre-connection.h" -#include "vinagre-enums.h" -#include "vinagre-bookmarks.h" - -struct _VinagreConnectionPrivate -{ - VinagreConnectionProtocol protocol; - gchar *host; - gint port; - gchar *name; - gchar *username; - gchar *password; - gchar *desktop_name; - gint shared; - gboolean view_only; - gboolean scaling; - gboolean fullscreen; -}; - -enum -{ - PROP_0, - PROP_PROTOCOL, - PROP_HOST, - PROP_PORT, - PROP_NAME, - PROP_USERNAME, - PROP_PASSWORD, - PROP_DESKTOP_NAME, - PROP_BEST_NAME, - PROP_ICON, - PROP_VIEW_ONLY, - PROP_SCALING, - PROP_FULLSCREEN, - PROP_SHARED, -}; - -gint vinagre_connection_default_port [VINAGRE_CONNECTION_PROTOCOL_INVALID-1] = {5900, 3389}; -gchar* vinagre_connection_protos [VINAGRE_CONNECTION_PROTOCOL_INVALID-1] = {"vnc", "rdp"}; - -#define VINAGRE_CONNECTION_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VINAGRE_TYPE_CONNECTION, VinagreConnectionPrivate)) -G_DEFINE_TYPE (VinagreConnection, vinagre_connection, G_TYPE_OBJECT); - -static void -vinagre_connection_init (VinagreConnection *conn) -{ - conn->priv = G_TYPE_INSTANCE_GET_PRIVATE (conn, VINAGRE_TYPE_CONNECTION, VinagreConnectionPrivate); - - conn->priv->protocol = VINAGRE_CONNECTION_PROTOCOL_VNC; - conn->priv->host = NULL; - conn->priv->port = 0; - conn->priv->password = NULL; - conn->priv->username = NULL; - conn->priv->name = NULL; - conn->priv->desktop_name = NULL; - conn->priv->view_only = FALSE; - conn->priv->scaling = FALSE; - conn->priv->fullscreen = FALSE; - conn->priv->shared = -1; -} - -static void -vinagre_connection_finalize (GObject *object) -{ - VinagreConnection *conn = VINAGRE_CONNECTION (object); - - g_free (conn->priv->host); - g_free (conn->priv->username); - g_free (conn->priv->password); - g_free (conn->priv->name); - g_free (conn->priv->desktop_name); - - G_OBJECT_CLASS (vinagre_connection_parent_class)->finalize (object); -} - -static void -vinagre_connection_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) -{ - VinagreConnection *conn; - - g_return_if_fail (VINAGRE_IS_CONNECTION (object)); - - conn = VINAGRE_CONNECTION (object); - - switch (prop_id) - { - case PROP_PROTOCOL: - vinagre_connection_set_protocol (conn, g_value_get_enum (value)); - break; - - case PROP_HOST: - vinagre_connection_set_host (conn, g_value_get_string (value)); - break; - - case PROP_PORT: - vinagre_connection_set_port (conn, g_value_get_int (value)); - break; - - case PROP_USERNAME: - vinagre_connection_set_username (conn, g_value_get_string (value)); - break; - - case PROP_PASSWORD: - vinagre_connection_set_password (conn, g_value_get_string (value)); - break; - - case PROP_NAME: - vinagre_connection_set_name (conn, g_value_get_string (value)); - break; - - case PROP_DESKTOP_NAME: - vinagre_connection_set_desktop_name (conn, g_value_get_string (value)); - break; - - case PROP_VIEW_ONLY: - vinagre_connection_set_view_only (conn, g_value_get_boolean (value)); - break; - - case PROP_SCALING: - vinagre_connection_set_scaling (conn, g_value_get_boolean (value)); - break; - - case PROP_FULLSCREEN: - vinagre_connection_set_fullscreen (conn, g_value_get_boolean (value)); - break; - - case PROP_SHARED: - vinagre_connection_set_shared (conn, g_value_get_int (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -vinagre_connection_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) -{ - VinagreConnection *conn; - - g_return_if_fail (VINAGRE_IS_CONNECTION (object)); - - conn = VINAGRE_CONNECTION (object); - - - switch (prop_id) - { - case PROP_PROTOCOL: - g_value_set_enum (value, conn->priv->protocol); - break; - - case PROP_HOST: - g_value_set_string (value, conn->priv->host); - break; - - case PROP_PORT: - g_value_set_int (value, conn->priv->port); - break; - - case PROP_USERNAME: - g_value_set_string (value, conn->priv->username); - break; - - case PROP_PASSWORD: - g_value_set_string (value, conn->priv->password); - break; - - case PROP_NAME: - g_value_set_string (value, conn->priv->name); - break; - - case PROP_DESKTOP_NAME: - g_value_set_string (value, conn->priv->desktop_name); - break; - - case PROP_BEST_NAME: - g_value_set_string (value, vinagre_connection_get_best_name (conn)); - break; - - case PROP_ICON: - g_value_set_object (value, vinagre_connection_get_icon (conn)); - break; - - case PROP_VIEW_ONLY: - g_value_set_boolean (value, conn->priv->view_only); - break; - - case PROP_SCALING: - g_value_set_boolean (value, conn->priv->scaling); - break; - - case PROP_FULLSCREEN: - g_value_set_boolean (value, conn->priv->fullscreen); - break; - - case PROP_SHARED: - g_value_set_int (value, conn->priv->shared); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -vinagre_connection_class_init (VinagreConnectionClass *klass) -{ - GObjectClass* object_class = G_OBJECT_CLASS (klass); - GObjectClass* parent_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (VinagreConnectionPrivate)); - - object_class->finalize = vinagre_connection_finalize; - object_class->set_property = vinagre_connection_set_property; - object_class->get_property = vinagre_connection_get_property; - - g_object_class_install_property (object_class, - PROP_PROTOCOL, - g_param_spec_enum ("protocol", - "protocol", - "connection protocol", - VINAGRE_TYPE_CONNECTION_PROTOCOL, - VINAGRE_CONNECTION_PROTOCOL_VNC, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_HOST, - g_param_spec_string ("host", - "hostname", - "hostname or ip address of this connection", - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_PORT, - g_param_spec_int ("port", - "port", - "tcp/ip port of this connection", - 0, - G_MAXINT, - 5900, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_NAME, - g_param_spec_string ("username", - "username", - "username (if any) necessary for complete this connection", - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_PASSWORD, - g_param_spec_string ("password", - "password", - "password (if any) necessary for complete this connection", - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_NAME, - g_param_spec_string ("name", - "connection name", - "friendly name for this connection", - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_DESKTOP_NAME, - g_param_spec_string ("desktop-name", - "desktop-name", - "name of this connection as reported by the server", - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_BEST_NAME, - g_param_spec_string ("best-name", - "best-name", - "preferred name for this connection", - NULL, - G_PARAM_READABLE | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_ICON, - g_param_spec_object ("icon", - "icon", - "icon of this connection", - GDK_TYPE_PIXBUF, - G_PARAM_READABLE | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - g_object_class_install_property (object_class, - PROP_VIEW_ONLY, - g_param_spec_boolean ("view-only", - "View-only connection", - "Whether this connection is a view-only one", - FALSE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - g_object_class_install_property (object_class, - PROP_SCALING, - g_param_spec_boolean ("scaling", - "Use scaling", - "Whether to use scaling on this connection", - FALSE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - g_object_class_install_property (object_class, - PROP_FULLSCREEN, - g_param_spec_boolean ("fullscreen", - "Full screen connection", - "Whether this connection is a view-only one", - FALSE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_PORT, - g_param_spec_int ("shared", - "shared flag", - "if the server should allow more than one client connected", - -1, - 1, - -1, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB)); - -} - -VinagreConnection * -vinagre_connection_new () -{ - return g_object_new (VINAGRE_TYPE_CONNECTION, NULL); -} - -void -vinagre_connection_set_protocol (VinagreConnection *conn, - VinagreConnectionProtocol protocol) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - conn->priv->protocol = protocol; -} -VinagreConnectionProtocol -vinagre_connection_get_protocol (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), - VINAGRE_CONNECTION_PROTOCOL_INVALID); - - return conn->priv->protocol; -} - -void -vinagre_connection_set_host (VinagreConnection *conn, - const gchar *host) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - if (conn->priv->host) - g_free (conn->priv->host); - conn->priv->host = g_strdup (host); -} -const gchar * -vinagre_connection_get_host (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - return conn->priv->host; -} - -void -vinagre_connection_set_port (VinagreConnection *conn, - gint port) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - conn->priv->port = port; -} -gint -vinagre_connection_get_port (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), 0); - - return conn->priv->port; -} - -void -vinagre_connection_set_username (VinagreConnection *conn, - const gchar *username) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - g_free (conn->priv->username); - conn->priv->username = g_strdup (username); -} -const gchar * -vinagre_connection_get_username (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - return conn->priv->username; -} - -void -vinagre_connection_set_password (VinagreConnection *conn, - const gchar *password) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - g_free (conn->priv->password); - conn->priv->password = g_strdup (password); -} -const gchar * -vinagre_connection_get_password (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - return conn->priv->password; -} - -void -vinagre_connection_set_name (VinagreConnection *conn, - const gchar *name) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - g_free (conn->priv->name); - conn->priv->name = g_strdup (name); -} -const gchar * -vinagre_connection_get_name (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - return conn->priv->name; -} - -void -vinagre_connection_set_desktop_name (VinagreConnection *conn, - const gchar *desktop_name) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - g_free (conn->priv->desktop_name); - conn->priv->desktop_name = g_strdup (desktop_name); -} -const gchar * -vinagre_connection_get_desktop_name (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - return conn->priv->desktop_name; -} - -gchar * -vinagre_connection_get_best_name (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - if (conn->priv->name) - return g_strdup (conn->priv->name); - - if (conn->priv->desktop_name) - return g_strdup (conn->priv->desktop_name); - - if (conn->priv->host) - return g_strdup_printf ("%s:%d", conn->priv->host, conn->priv->port); - - return NULL; -} - -void -vinagre_connection_set_shared (VinagreConnection *conn, - gint value) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - g_return_if_fail (value >=0 && value <=1); - - conn->priv->shared = value; -} -gint -vinagre_connection_get_shared (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), -1); - - return conn->priv->shared; -} - -VinagreConnection * -vinagre_connection_clone (VinagreConnection *conn) -{ - VinagreConnection *new_conn; - - new_conn = vinagre_connection_new (); - - vinagre_connection_set_host (new_conn, vinagre_connection_get_host (conn)); - vinagre_connection_set_port (new_conn, vinagre_connection_get_port (conn)); - vinagre_connection_set_username (new_conn, vinagre_connection_get_username (conn)); - vinagre_connection_set_password (new_conn, vinagre_connection_get_password (conn)); - vinagre_connection_set_name (new_conn, vinagre_connection_get_name (conn)); - vinagre_connection_set_desktop_name (new_conn, vinagre_connection_get_desktop_name (conn)); - vinagre_connection_set_view_only (new_conn, vinagre_connection_get_view_only (conn)); - vinagre_connection_set_scaling (new_conn, vinagre_connection_get_scaling (conn)); - vinagre_connection_set_fullscreen (new_conn, vinagre_connection_get_fullscreen (conn)); - - return new_conn; -} - -gboolean -vinagre_connection_split_string (const gchar *uri, - gchar **host, - gint *port, - gchar **error_msg) -{ - gchar **server, **url; - gint lport; - gchar *lhost; - gchar ipv6_host[255] = {0,}; - - *error_msg = NULL; - *host = NULL; - *port = 0; - - url = g_strsplit (uri, "://", 2); - if (g_strv_length (url) == 2) - { - if (g_strcmp0 (url[0], "vnc")) - { - *error_msg = g_strdup_printf (_("The protocol %s is not supported."), - url[0]); - g_strfreev (url); - return FALSE; - } - lhost = url[1]; - } - else - lhost = (gchar *) uri; - - if (lhost[0] == '[') - { - int i; - for (i = 1; lhost[i] && lhost[i] != ']'; i++) - { - ipv6_host[i-1] = lhost[i]; - lhost[i-1] = '_'; - } - ipv6_host[i-1] = '\0'; - lhost[i] = '_'; - } - - if (g_strrstr (lhost, "::") != NULL) - { - server = g_strsplit (lhost, "::", 2); - lport = server[1] ? atoi (server[1]) : 5900; - } - else - { - server = g_strsplit (lhost, ":", 2); - lport = server[1] ? atoi (server[1]) : 5900; - - if (lport < 1024) - lport += 5900; - } - - lhost = ipv6_host[0] ? ipv6_host : server[0]; - - *host = g_strdup (lhost); - *port = lport; - - g_strfreev (server); - g_strfreev (url); - - return TRUE; -} - -VinagreConnection * -vinagre_connection_new_from_string (const gchar *uri, gchar **error_msg, gboolean use_bookmarks) -{ - VinagreConnection *conn = NULL; - gint port; - gchar *host; - - if (!vinagre_connection_split_string (uri, &host, &port, error_msg)) - return NULL; - - if (use_bookmarks) - conn = vinagre_bookmarks_exists (vinagre_bookmarks_get_default (), - host, - port); - if (!conn) - { - conn = vinagre_connection_new (); - vinagre_connection_set_host (conn, host); - vinagre_connection_set_port (conn, port); - } - - g_free (host); - return conn; -} - -VinagreConnection * -vinagre_connection_new_from_file (const gchar *uri, gchar **error_msg, gboolean use_bookmarks) -{ - GKeyFile *file; - GError *error; - gboolean loaded; - VinagreConnection *conn; - gchar *host, *actual_host, *data; - gint port; - int file_size; - GFile *file_a; - - *error_msg = NULL; - host = NULL; - data = NULL; - conn = NULL; - error = NULL; - file = NULL; - conn = NULL; - - file_a = g_file_new_for_commandline_arg (uri); - loaded = g_file_load_contents (file_a, - NULL, - &data, - &file_size, - NULL, - &error); - if (!loaded) - { - if (error) - { - *error_msg = g_strdup (error->message); - g_error_free (error); - } - else - *error_msg = g_strdup (_("Could not open the file.")); - - goto the_end; - } - - file = g_key_file_new (); - loaded = g_key_file_load_from_data (file, - data, - file_size, - 0, - &error); - if (!loaded) - { - if (error) - { - *error_msg = g_strdup (error->message); - g_error_free (error); - } - else - *error_msg = g_strdup (_("Could not parse the file.")); - - goto the_end; - } - - host = g_key_file_get_string (file, "connection", "host", NULL); - port = g_key_file_get_integer (file, "connection", "port", NULL); - if (host) - { - if (!port) - { - if (!vinagre_connection_split_string (host, &actual_host, &port, error_msg)) - goto the_end; - - g_free (host); - host = actual_host; - } - - if (use_bookmarks) - conn = vinagre_bookmarks_exists (vinagre_bookmarks_get_default (), host, port); - if (!conn) - { - gchar *username, *password; - gint shared; - GError *e = NULL; - - conn = vinagre_connection_new (); - vinagre_connection_set_host (conn, host); - vinagre_connection_set_port (conn, port); - - username = g_key_file_get_string (file, "connection", "username", NULL); - vinagre_connection_set_username (conn, username); - g_free (username); - - password = g_key_file_get_string (file, "connection", "password", NULL); - vinagre_connection_set_password (conn, password); - g_free (password); - - shared = g_key_file_get_integer (file, "options", "shared", &e); - if (e) - g_error_free (e); - else - if (shared == 0 || shared == 1) - vinagre_connection_set_shared (conn, shared); - else - g_message (_("Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it."), shared); - } - - g_free (host); - } - else - *error_msg = g_strdup (_("Could not find the host address in the file.")); - -the_end: - g_free (data); - g_object_unref (file_a); - if (file) - g_key_file_free (file); - - return conn; -} - -GdkPixbuf * -vinagre_connection_get_icon (VinagreConnection *conn) -{ - GdkPixbuf *pixbuf; - GtkIconTheme *icon_theme; - - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - icon_theme = gtk_icon_theme_get_default (); - pixbuf = gtk_icon_theme_load_icon (icon_theme, - "application-x-vnc", - 16, - 0, - NULL); - - return pixbuf; -} - -void -vinagre_connection_set_view_only (VinagreConnection *conn, - gboolean value) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - conn->priv->view_only = value; -} -gboolean -vinagre_connection_get_view_only (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), FALSE); - - return conn->priv->view_only; -} - -void -vinagre_connection_set_scaling (VinagreConnection *conn, - gboolean value) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - conn->priv->scaling = value; -} -gboolean -vinagre_connection_get_scaling (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), FALSE); - - return conn->priv->scaling; -} - -void -vinagre_connection_set_fullscreen (VinagreConnection *conn, - gboolean value) -{ - g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); - - conn->priv->fullscreen = value; -} -gboolean -vinagre_connection_get_fullscreen (VinagreConnection *conn) -{ - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), FALSE); - - return conn->priv->fullscreen; -} - -gchar* -vinagre_connection_get_string_rep (VinagreConnection *conn, - gboolean has_protocol) -{ - GString *uri; - gchar *result; - gboolean is_ipv6; - - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - is_ipv6 = g_strstr_len (conn->priv->host, -1, ":") != NULL; - - if (has_protocol) - { - uri = g_string_new (vinagre_connection_protos [conn->priv->protocol-1]); - g_string_append (uri, "://"); - } - else - uri = g_string_new (NULL); - - if (is_ipv6) - g_string_append_c (uri, '['); - g_string_append (uri, conn->priv->host); - if (is_ipv6) - g_string_append_c (uri, ']'); - - if (vinagre_connection_default_port [conn->priv->protocol-1] != conn->priv->port) - g_string_append_printf (uri, "::%d", conn->priv->port); - - result = uri->str; - g_string_free (uri, FALSE); - - return result; -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-connection.h vinagre-2.29.1/src/vinagre-connection.h --- vinagre-2.26.1/src/vinagre-connection.h 2008-11-16 10:44:59.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-connection.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,125 +0,0 @@ -/* - * vinagre-connection.h - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_CONNECTION_H__ -#define __VINAGRE_CONNECTION_H__ - -#include -#include - -G_BEGIN_DECLS - -#define VINAGRE_TYPE_CONNECTION (vinagre_connection_get_type ()) -#define VINAGRE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_CONNECTION, VinagreConnection)) -#define VINAGRE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_CONNECTION, VinagreConnectionClass)) -#define VINAGRE_IS_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_CONNECTION)) -#define VINAGRE_IS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_CONNECTION)) -#define VINAGRE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_CONNECTION, VinagreConnectionClass)) - -typedef struct _VinagreConnectionClass VinagreConnectionClass; -typedef struct _VinagreConnection VinagreConnection; -typedef struct _VinagreConnectionPrivate VinagreConnectionPrivate; - -typedef enum -{ - VINAGRE_CONNECTION_PROTOCOL_VNC = 1, - VINAGRE_CONNECTION_PROTOCOL_RDP, - VINAGRE_CONNECTION_PROTOCOL_INVALID -} VinagreConnectionProtocol; - -struct _VinagreConnectionClass -{ - GObjectClass parent_class; -}; - -struct _VinagreConnection -{ - GObject parent_instance; - VinagreConnectionPrivate *priv; -}; - -GType vinagre_connection_get_type (void) G_GNUC_CONST; - -VinagreConnection *vinagre_connection_new (void); - -VinagreConnectionProtocol vinagre_connection_get_protocol (VinagreConnection *conn); -void vinagre_connection_set_protocol (VinagreConnection *conn, - VinagreConnectionProtocol protocol); - -const gchar* vinagre_connection_get_host (VinagreConnection *conn); -void vinagre_connection_set_host (VinagreConnection *conn, - const gchar *host); - -gint vinagre_connection_get_port (VinagreConnection *conn); -void vinagre_connection_set_port (VinagreConnection *conn, - gint port); - -const gchar* vinagre_connection_get_username (VinagreConnection *conn); -void vinagre_connection_set_username (VinagreConnection *conn, - const gchar *username); - -const gchar* vinagre_connection_get_password (VinagreConnection *conn); -void vinagre_connection_set_password (VinagreConnection *conn, - const gchar *password); - -const gchar* vinagre_connection_get_name (VinagreConnection *conn); -void vinagre_connection_set_name (VinagreConnection *conn, - const gchar *name); - -const gchar* vinagre_connection_get_desktop_name (VinagreConnection *conn); -void vinagre_connection_set_desktop_name (VinagreConnection *conn, - const gchar *desktop_name); - -gchar* vinagre_connection_get_best_name (VinagreConnection *conn); - -VinagreConnection* vinagre_connection_clone (VinagreConnection *conn); - -VinagreConnection* vinagre_connection_new_from_string (const gchar *url, gchar **error_msg, gboolean use_bookmarks); -VinagreConnection* vinagre_connection_new_from_file (const gchar *uri, gchar **error_msg, gboolean use_bookmarks); - -GdkPixbuf* vinagre_connection_get_icon (VinagreConnection *conn); - -gboolean vinagre_connection_get_view_only (VinagreConnection *conn); -void vinagre_connection_set_view_only (VinagreConnection *conn, - gboolean value); - -gboolean vinagre_connection_get_scaling (VinagreConnection *conn); -void vinagre_connection_set_scaling (VinagreConnection *conn, - gboolean value); - -gboolean vinagre_connection_get_fullscreen (VinagreConnection *conn); -void vinagre_connection_set_fullscreen (VinagreConnection *conn, - gboolean value); - -gint vinagre_connection_get_shared (VinagreConnection *conn); -void vinagre_connection_set_shared (VinagreConnection *conn, - gint value); - -gboolean vinagre_connection_split_string (const gchar *uri, - gchar **host, - gint *port, - gchar **error_msg); - -gchar* vinagre_connection_get_string_rep (VinagreConnection *conn, - gboolean has_protocol); -G_END_DECLS - -#endif /* __VINAGRE_CONNECTION_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-fav.c vinagre-2.29.1/src/vinagre-fav.c --- vinagre-2.26.1/src/vinagre-fav.c 2008-12-11 19:14:19.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-fav.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,872 +0,0 @@ -/* - * vinagre-fav.c - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include "vinagre-fav.h" -#include "vinagre-utils.h" -#include "vinagre-bookmarks.h" -#include "vinagre-window-private.h" -#include "vinagre-bookmarks-entry.h" - -#ifdef VINAGRE_ENABLE_AVAHI -#include "vinagre-mdns.h" -#endif - -#define VINAGRE_FAV_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_FAV, VinagreFavPrivate)) - -struct _VinagreFavPrivate -{ - VinagreWindow *window; - GtkWidget *tree; - GtkTreeModel *model; -}; - -G_DEFINE_TYPE(VinagreFav, vinagre_fav, GTK_TYPE_VBOX) - -/* Signals */ -enum -{ - FAV_ACTIVATED, - FAV_SELECTED, - LAST_SIGNAL -}; - -/* TreeModel */ -enum { - IMAGE_COL = 0, - NAME_COL, - ENTRY_COL, - IS_FOLDER_COL, - IS_GROUP_COL, - IS_AVAHI_COL, - NUM_COLS -}; - -/* Properties */ -enum -{ - PROP_0, - PROP_WINDOW, -}; - - -static guint signals[LAST_SIGNAL] = { 0 }; - -static void -vinagre_fav_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - VinagreFav *fav = VINAGRE_FAV (object); - - switch (prop_id) - { - case PROP_WINDOW: - fav->priv->window = VINAGRE_WINDOW (g_value_get_object (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -vinagre_fav_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - VinagreFav *fav = VINAGRE_FAV (object); - - switch (prop_id) - { - case PROP_WINDOW: - g_value_set_object (value, fav->priv->window); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -vinagre_fav_class_init (VinagreFavClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->get_property = vinagre_fav_get_property; - object_class->set_property = vinagre_fav_set_property; - - g_object_class_install_property (object_class, - PROP_WINDOW, - g_param_spec_object ("window", - "Window", - "The VinagreWindow this panel is associated with", - VINAGRE_TYPE_WINDOW, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY)); - - signals[FAV_ACTIVATED] = - g_signal_new ("fav-activated", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (VinagreFavClass, fav_activated), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, - G_TYPE_POINTER); - - signals[FAV_SELECTED] = - g_signal_new ("fav-selected", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (VinagreFavClass, fav_selected), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, - 1, - G_TYPE_POINTER); - - g_type_class_add_private (object_class, sizeof (VinagreFavPrivate)); -} - -static void -vinagre_fav_row_activated_cb (GtkTreeView *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - VinagreFav *fav) -{ - GtkTreeIter iter; - VinagreBookmarksEntry *entry; - gboolean folder, group; - - gtk_tree_model_get_iter (fav->priv->model, &iter, path); - gtk_tree_model_get (fav->priv->model, - &iter, - ENTRY_COL, &entry, - IS_FOLDER_COL, &folder, - IS_GROUP_COL, &group, - -1); - - if (folder || group) - { - if (gtk_tree_view_row_expanded (treeview, path)) - gtk_tree_view_collapse_row (treeview, path); - else - gtk_tree_view_expand_row (treeview, path, FALSE); - return; - } - - /* Emits the signal saying that user has activated a bookmark */ - g_signal_emit (G_OBJECT (fav), - signals[FAV_ACTIVATED], - 0, - entry); -} - -static void -vinagre_fav_selection_changed_cb (GtkTreeSelection *selection, - VinagreFav *fav) -{ - GtkTreeIter iter; - VinagreBookmarksEntry *entry; - gboolean avahi; - - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) - { - gtk_tree_model_get (fav->priv->model, - &iter, - ENTRY_COL, &entry, - IS_AVAHI_COL, &avahi, - -1); - } - - if (avahi) - entry = NULL; - - /* Emits the signal saying that user has selected a bookmark */ - g_signal_emit (G_OBJECT (fav), - signals[FAV_SELECTED], - 0, - entry); -} - -static GtkTreePath * -get_current_path (VinagreFav *fav) -{ - GtkTreePath *path = NULL; - GtkTreeIter iter; - GtkTreeSelection *selection; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fav->priv->tree)); - - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) - path = gtk_tree_model_get_path (fav->priv->model, &iter); - - return path; -} - -static void -menu_position (GtkMenu *menu, - gint *x, - gint *y, - gboolean *push_in, - VinagreFav *fav) -{ - GtkTreePath *path; - GdkRectangle rect; - gint wx, wy; - GtkRequisition requisition; - GtkWidget *w; - - w = fav->priv->tree; - path = get_current_path (fav); - - gtk_tree_view_get_cell_area (GTK_TREE_VIEW (w), - path, - NULL, - &rect); - - wx = rect.x; - wy = rect.y; - - gdk_window_get_origin (w->window, x, y); - - gtk_widget_size_request (GTK_WIDGET (menu), &requisition); - - if (gtk_widget_get_direction (w) == GTK_TEXT_DIR_RTL) - *x += w->allocation.x + w->allocation.width - requisition.width - 10; - else - *x += w->allocation.x + 10 ; - - wy = MAX (*y + 5, *y + wy + 5); - wy = MIN (wy, *y + w->allocation.height - requisition.height - 5); - - *y = wy; - - *push_in = TRUE; - - if (path) - gtk_tree_path_free (path); -} - -static gboolean -show_popup_menu (VinagreFav *fav, - GdkEventButton *event, - const gchar *menu_name) -{ - GtkWidget *menu = NULL; - - menu = gtk_ui_manager_get_widget (vinagre_window_get_ui_manager (fav->priv->window), - menu_name); - g_return_val_if_fail (menu != NULL, FALSE); - - if (event) - { - gtk_menu_popup (GTK_MENU (menu), - NULL, - NULL, - NULL, - NULL, - event->button, - event->time); - } - else - { - gtk_menu_popup (GTK_MENU (menu), - NULL, - NULL, - (GtkMenuPositionFunc) menu_position, - fav, - 0, - gtk_get_current_event_time ()); - } - - return TRUE; -} - -static gboolean -fav_button_press_event (GtkTreeView *treeview, - GdkEventButton *event, - VinagreFav *fav) -{ - GtkTreePath *path = NULL; - GtkTreeIter iter; - gboolean folder, group, avahi; - - if (!((GDK_BUTTON_PRESS == event->type) && (3 == event->button))) - return FALSE; - - if (event->window != gtk_tree_view_get_bin_window (treeview)) - return FALSE; - - if (gtk_tree_view_get_path_at_pos (treeview, - event->x, - event->y, - &path, - NULL, - NULL, - NULL)) - { - gtk_tree_model_get_iter (fav->priv->model, &iter, path); - gtk_tree_model_get (fav->priv->model, - &iter, - IS_FOLDER_COL, &folder, - IS_GROUP_COL, &group, - IS_AVAHI_COL, &avahi, - -1); - if (group || avahi) - { - gtk_tree_path_free (path); - return FALSE; - } - - gtk_tree_view_set_cursor (treeview, - path, - NULL, - FALSE); - gtk_tree_path_free (path); - return show_popup_menu (fav, event, folder?"/FavPopupFolder":"/FavPopupConn"); - } - else - return show_popup_menu (fav, event, "/FavPopupEmpty"); - - return FALSE; -} - - -static gboolean -fav_popup_menu (GtkWidget *treeview, - VinagreFav *fav) -{ - /* Only respond if the treeview is the actual focus */ - if (gtk_window_get_focus (GTK_WINDOW (fav->priv->window)) == treeview) - return show_popup_menu (fav, NULL, FALSE); - - return FALSE; -} - -static gboolean -vinagre_fav_tooltip (GtkWidget *widget, - gint x, - gint y, - gboolean k, - GtkTooltip *tooltip, - VinagreFav *fav) -{ - gchar *tip, *name, *uri; - GtkTreePath *path; - gint bx, by; - GtkTreeIter iter; - gboolean folder, group; - VinagreConnection *conn; - VinagreBookmarksEntry *entry; - - gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (widget), - x, y, - &bx, &by); - - if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), - bx, - by, - &path, - NULL, - NULL, - NULL)) - return FALSE; - - gtk_tree_model_get_iter (fav->priv->model, &iter, path); - gtk_tree_model_get (fav->priv->model, - &iter, - ENTRY_COL, &entry, - IS_FOLDER_COL, &folder, - IS_GROUP_COL, &group, - -1); - - gtk_tree_path_free (path); - - if (folder || group) - return FALSE; - - conn = vinagre_bookmarks_entry_get_conn (entry); - name = vinagre_connection_get_best_name (conn); - uri = vinagre_connection_get_string_rep (conn, TRUE); - tip = g_markup_printf_escaped ("%s\n" - "%s %s", - name, - _("Host:"), uri); - - gtk_tooltip_set_markup (tooltip, tip); - g_free (tip); - g_free (name); - g_free (uri); - - return TRUE; -} - -static void -vinagre_fav_cell_set_background (VinagreFav *fav, - GtkCellRenderer *cell, - gboolean is_group, - gboolean is_active) -{ - GdkColor color; - GtkStyle *style; - - g_return_if_fail (fav != NULL); - g_return_if_fail (cell != NULL); - - style = gtk_widget_get_style (GTK_WIDGET (fav)); - - if (!is_group) - { - if (is_active) - { - color = style->bg[GTK_STATE_SELECTED]; - - /* Here we take the current theme colour and add it to - * the colour for white and average the two. This - * gives a colour which is inline with the theme but - * slightly whiter. - */ - color.red = (color.red + (style->white).red) / 2; - color.green = (color.green + (style->white).green) / 2; - color.blue = (color.blue + (style->white).blue) / 2; - - g_object_set (cell, - "cell-background-gdk", &color, - NULL); - - } - else - { - g_object_set (cell, - "cell-background-gdk", NULL, - NULL); - } - } - else - { - color = style->text_aa[GTK_STATE_INSENSITIVE]; - - color.red = (color.red + (style->white).red) / 2; - color.green = (color.green + (style->white).green) / 2; - color.blue = (color.blue + (style->white).blue) / 2; - - g_object_set (cell, - "cell-background-gdk", &color, - NULL); - } -} - -static void -vinagre_fav_pixbuf_cell_data_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - VinagreFav *fav) -{ - GdkPixbuf *pixbuf; - gboolean is_group; - gboolean is_active; - - gtk_tree_model_get (model, iter, - IS_GROUP_COL, &is_group, - IMAGE_COL, &pixbuf, - -1); - - g_object_set (cell, - "visible", !is_group, - "pixbuf", pixbuf, - NULL); - - if (pixbuf != NULL) - g_object_unref (pixbuf); - - is_active = FALSE; - vinagre_fav_cell_set_background (fav, cell, is_group, is_active); -} - -static void -vinagre_fav_title_cell_data_func (GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - VinagreFav *fav) -{ - char *str; - gboolean is_group; - gboolean is_active; - - gtk_tree_model_get (GTK_TREE_MODEL (fav->priv->model), iter, - NAME_COL, &str, - IS_GROUP_COL, &is_group, - -1); - - g_object_set (renderer, - "text", str, - NULL); - - is_active = FALSE; - vinagre_fav_cell_set_background (fav, renderer, is_group, is_active); - - g_free (str); -} - -static void -vinagre_fav_create_tree (VinagreFav *fav) -{ - GtkCellRenderer *cell; - GtkWidget *scroll; - GtkTreeSelection *selection; - GtkTreeViewColumn *main_column; - - /* Create the scrolled window */ - scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), - GTK_SHADOW_ETCHED_OUT); - - gtk_box_pack_start (GTK_BOX(fav), scroll, TRUE, TRUE, 0); - - /* Create the model */ - fav->priv->model = GTK_TREE_MODEL (gtk_tree_store_new (NUM_COLS, - GDK_TYPE_PIXBUF, - G_TYPE_STRING, - VINAGRE_TYPE_BOOKMARKS_ENTRY, - G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN)); - - fav->priv->tree = gtk_tree_view_new_with_model (fav->priv->model); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (fav->priv->tree), FALSE); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fav->priv->tree)); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - g_signal_connect (selection, "changed", G_CALLBACK (vinagre_fav_selection_changed_cb), fav); - - main_column = gtk_tree_view_column_new (); - gtk_tree_view_column_set_clickable (main_column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW (fav->priv->tree), main_column); - - /* Set up the pixbuf column */ - cell = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (main_column, cell, FALSE); - gtk_tree_view_column_set_cell_data_func (main_column, - cell, - (GtkTreeCellDataFunc) vinagre_fav_pixbuf_cell_data_func, - fav, - NULL); - - /* Set up the name column */ - cell = gtk_cell_renderer_text_new (); - g_object_set (cell, - "ellipsize", PANGO_ELLIPSIZE_END, - NULL); - gtk_tree_view_column_pack_start (main_column, cell, TRUE); - gtk_tree_view_column_set_cell_data_func (main_column, - cell, - (GtkTreeCellDataFunc) vinagre_fav_title_cell_data_func, - fav, - NULL); - - g_signal_connect (fav->priv->tree, - "row-activated", - G_CALLBACK (vinagre_fav_row_activated_cb), - fav); - - g_signal_connect (fav->priv->tree, - "button-press-event", - G_CALLBACK (fav_button_press_event), - fav); - - g_signal_connect (fav->priv->tree, - "popup-menu", - G_CALLBACK (fav_popup_menu), - fav); - - gtk_widget_set_has_tooltip (fav->priv->tree, TRUE); - g_signal_connect (fav->priv->tree, - "query-tooltip", - G_CALLBACK (vinagre_fav_tooltip), - fav); - - g_idle_add ((GSourceFunc)vinagre_fav_update_list, fav); - - gtk_container_add (GTK_CONTAINER(scroll), fav->priv->tree); - - gtk_widget_show (fav->priv->tree); - g_object_unref (G_OBJECT (fav->priv->model)); -} - -static void -drag_data_received_handl (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *selection_data, - guint target_type, - guint time, - VinagreFav *fav) -{ - gchar *_sdata; - gboolean success = FALSE; - - if ((selection_data != NULL) && (selection_data->length >= 0)) - { - switch (target_type) - { - case TARGET_VINAGRE: - _sdata = (gchar*)selection_data-> data; - success = TRUE; - break; - - default: - g_print ("nothing good"); - } - } - - gtk_drag_finish (context, success, FALSE, time); - - if (success) - { - VinagreConnection *conn; - gchar **info; - gchar *error = NULL; - - info = g_strsplit (_sdata, "||", 2); - if (g_strv_length (info) != 2) - { - vinagre_utils_show_error (_("Invalid operation"), - _("Data received from drag&drop operation is invalid."), - GTK_WINDOW (fav->priv->window)); - return; - } - - conn = vinagre_connection_new_from_string (info[1], &error, FALSE); - if (!conn) - { - g_strfreev (info); - vinagre_utils_show_error (NULL, - error ? error : _("Unknown error"), - GTK_WINDOW (fav->priv->window)); - return; - } - - vinagre_connection_set_name (conn, info[0]); - vinagre_bookmarks_add (vinagre_bookmarks_get_default (), - conn, - GTK_WINDOW (fav->priv->window)); - - g_strfreev (info); - g_object_unref (conn); - } -} - -static gboolean -drag_drop_handl (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - guint time, - gpointer user_data) -{ - gboolean is_valid_drop_site; - GdkAtom target_type; - - is_valid_drop_site = FALSE; - - if (context->targets) - { - target_type = GDK_POINTER_TO_ATOM (g_list_nth_data (context->targets, TARGET_VINAGRE)); - gtk_drag_get_data (widget, - context, - target_type, - time); - is_valid_drop_site = TRUE; - } - - return is_valid_drop_site; -} - -static void -vinagre_fav_init (VinagreFav *fav) -{ - GtkWidget *label_box, *label, *close_button; - - fav->priv = VINAGRE_FAV_GET_PRIVATE (fav); - - /* setup the tree */ - vinagre_fav_create_tree (fav); - - gtk_drag_dest_set (fav->priv->tree, - GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT, - vinagre_target_list, - vinagre_n_targets, - GDK_ACTION_COPY); - - g_signal_connect (fav->priv->tree, - "drag-data-received", - G_CALLBACK(drag_data_received_handl), - fav); - g_signal_connect (fav->priv->tree, - "drag-drop", - G_CALLBACK (drag_drop_handl), - NULL); - - g_signal_connect_swapped (vinagre_bookmarks_get_default (), - "changed", - G_CALLBACK (vinagre_fav_update_list), - fav); -#ifdef VINAGRE_ENABLE_AVAHI - g_signal_connect_swapped (vinagre_mdns_get_default (), - "changed", - G_CALLBACK (vinagre_fav_update_list), - fav); -#endif -} - -GtkWidget * -vinagre_fav_new (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return GTK_WIDGET (g_object_new (VINAGRE_TYPE_FAV, - "window", window, - NULL)); -} - -static void -vinagre_fav_fill_bookmarks (GtkTreeStore *store, GSList *list, GtkTreeIter *parent_iter, gboolean is_avahi) -{ - GdkPixbuf *pixbuf; - GtkIconTheme *icon_theme; - gchar *name; - VinagreBookmarksEntry *entry; - GSList *l; - GtkTreeIter iter; - - for (l = list; l; l = l->next) - { - entry = (VinagreBookmarksEntry *) l->data; - switch (vinagre_bookmarks_entry_get_node (entry)) - { - case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: - icon_theme = gtk_icon_theme_get_default (); - pixbuf = gtk_icon_theme_load_icon (icon_theme, - "folder", - 16, - 0, - NULL); - - gtk_tree_store_append (store, &iter, parent_iter); - gtk_tree_store_set (store, &iter, - IMAGE_COL, pixbuf, - NAME_COL, vinagre_bookmarks_entry_get_name (entry), - ENTRY_COL, entry, - IS_FOLDER_COL, TRUE, - IS_GROUP_COL, FALSE, - IS_AVAHI_COL, FALSE, - -1); - if (pixbuf != NULL) - g_object_unref (pixbuf); - - vinagre_fav_fill_bookmarks (store, vinagre_bookmarks_entry_get_children (entry), &iter, is_avahi); - break; - - case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: - name = vinagre_connection_get_best_name (vinagre_bookmarks_entry_get_conn (entry)); - pixbuf = vinagre_connection_get_icon (vinagre_bookmarks_entry_get_conn (entry)); - - gtk_tree_store_append (store, &iter, parent_iter); - gtk_tree_store_set (store, &iter, - IMAGE_COL, pixbuf, - NAME_COL, name, - ENTRY_COL, entry, - IS_FOLDER_COL, FALSE, - IS_GROUP_COL, FALSE, - IS_AVAHI_COL, is_avahi, - -1); - g_free (name); - if (pixbuf != NULL) - g_object_unref (pixbuf); - break; - - default: - g_assert_not_reached (); - } - } -} - -gboolean -vinagre_fav_update_list (VinagreFav *fav) -{ - GtkTreeIter iter, parent_iter; - GtkTreeStore *store; - GSList *list, *l, *next; - GdkPixbuf *pixbuf; - - g_return_val_if_fail (VINAGRE_IS_FAV (fav), FALSE); - - store = GTK_TREE_STORE (fav->priv->model); - gtk_tree_store_clear (store); - - /* bookmarks */ - list = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()); - - gtk_tree_store_append (store, &parent_iter, NULL); - gtk_tree_store_set (store, &parent_iter, - NAME_COL, _("Bookmarks"), - IS_GROUP_COL, TRUE, - IS_FOLDER_COL, FALSE, - IS_AVAHI_COL, FALSE, - -1); - - vinagre_fav_fill_bookmarks (store, list, NULL, FALSE); - -#ifdef VINAGRE_ENABLE_AVAHI - list = vinagre_mdns_get_all (vinagre_mdns_get_default ()); - if (!list) - return FALSE; - - gtk_tree_store_append (store, &parent_iter, NULL); - gtk_tree_store_set (store, &parent_iter, - NAME_COL, _("Hosts nearby"), - IS_GROUP_COL, TRUE, - IS_FOLDER_COL, FALSE, - IS_AVAHI_COL, FALSE, - -1); - - vinagre_fav_fill_bookmarks (store, list, NULL, TRUE); -#endif - - return FALSE; -} -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-fav.h vinagre-2.29.1/src/vinagre-fav.h --- vinagre-2.26.1/src/vinagre-fav.h 2008-11-28 18:10:23.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-fav.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -/* - * vinagre-fav.h - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_FAV_H__ -#define __VINAGRE_FAV_H__ - -#include -#include "vinagre-bookmarks-entry.h" -#include "vinagre-window.h" - -G_BEGIN_DECLS - -#define VINAGRE_TYPE_FAV (vinagre_fav_get_type()) -#define VINAGRE_FAV(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_FAV, VinagreFav)) -#define VINAGRE_FAV_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_FAV, VinagreFav const)) -#define VINAGRE_FAV_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_FAV, VinagreFavClass)) -#define VINAGRE_IS_FAV(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_FAV)) -#define VINAGRE_IS_FAV_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_FAV)) -#define VINAGRE_FAV_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_FAV, VinagreFavClass)) - -typedef struct _VinagreFavPrivate VinagreFavPrivate; -typedef struct _VinagreFav VinagreFav; -typedef struct _VinagreFavClass VinagreFavClass; - -struct _VinagreFav -{ - GtkVBox vbox; - VinagreFavPrivate *priv; -}; - -struct _VinagreFavClass -{ - GtkVBoxClass parent_class; - - /* Signals */ - void (* fav_activated) (VinagreFav *fav, - VinagreBookmarksEntry *entry); - - void (* fav_selected) (VinagreFav *fav, - VinagreBookmarksEntry *entry); -}; - -GType vinagre_fav_get_type (void) G_GNUC_CONST; - -GtkWidget *vinagre_fav_new (VinagreWindow *window); - -gboolean vinagre_fav_update_list (VinagreFav *fav); - -G_END_DECLS - -#endif /* __VINAGRE_FAV_H__ */ diff -Nru vinagre-2.26.1/src/vinagre-main.c vinagre-2.29.1/src/vinagre-main.c --- vinagre-2.26.1/src/vinagre-main.c 2008-12-11 19:45:04.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-main.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,184 +0,0 @@ -/* - * vinagre-main.c - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include - -#include "vinagre-connection.h" -#include "vinagre-commands.h" -#include "vinagre-bookmarks.h" -#include "vinagre-window.h" -#include "vinagre-app.h" -#include "vinagre-utils.h" -#include "vinagre-prefs.h" -#include "vinagre-bacon.h" -#include - -#ifdef VINAGRE_ENABLE_AVAHI -#include "vinagre-mdns.h" -#endif - -/* command line */ -static gchar **files = NULL; -static gchar **remaining_args = NULL; -static GSList *servers = NULL; -static gboolean new_window = FALSE; - -static const GOptionEntry options [] = -{ - { "file", 'f', 0, G_OPTION_ARG_FILENAME_ARRAY, &files, - N_("Opens a .vnc file"), N_("filename")}, - - { "new-window", 'n', 0, G_OPTION_ARG_NONE, &new_window, - N_("Create a new toplevel window in an existing instance of vinagre"), NULL }, - - { - G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &remaining_args, - NULL, N_("[server:port]") }, - - { NULL } -}; - -static void -vinagre_main_process_command_line (VinagreWindow *window) -{ - gint i; - VinagreConnection *conn; - gchar *error; - GSList *errors = NULL; - - if (files) - { - for (i = 0; files[i]; i++) - { - conn = vinagre_connection_new_from_file (files[i], &error, FALSE); - if (conn) - servers = g_slist_prepend (servers, conn); - else - { - errors = g_slist_prepend (errors, - g_strdup_printf ("%s: %s", - files[i], - error ? error : _("Unknown error"))); - if (error) - g_free (error); - } - } - g_strfreev (files); - } - - if (remaining_args) - { - for (i = 0; remaining_args[i]; i++) - { - conn = vinagre_connection_new_from_string (remaining_args[i], &error, TRUE); - if (conn) - servers = g_slist_prepend (servers, conn); - else - errors = g_slist_prepend (errors, - g_strdup_printf ("%s: %s", - remaining_args[i], - error ? error : _("Unknown error"))); - - if (error) - g_free (error); - } - - g_strfreev (remaining_args); - } - - if (errors) - { - vinagre_utils_show_many_errors (ngettext ("The following error has occurred:", - "The following errors have occurred:", - g_slist_length (errors)), - errors, - window?GTK_WINDOW (window):NULL); - g_slist_free (errors); - } -} - -int main (int argc, char **argv) { - GOptionContext *context; - GError *error = NULL; - GSList *l, *next; - VinagreWindow *window; - VinagreApp *app; - - setlocale (LC_ALL, ""); - bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - /* Setup command line options */ - context = g_option_context_new (_("- VNC Client for GNOME")); - g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - g_option_context_add_group (context, vnc_display_get_option_group ()); - g_option_context_parse (context, &argc, &argv, &error); - if (error) - { - g_print ("%s\n%s\n", - error->message, - _("Run 'vinagre --help' to see a full list of available command line options")); - g_error_free (error); - return 1; - } - - g_set_application_name (_("Remote Desktop Viewer")); - vinagre_main_process_command_line (NULL); - - vinagre_bacon_start (servers, new_window); - - if (!g_thread_supported ()) - g_thread_init (NULL); - - app = vinagre_app_get_default (); - window = vinagre_app_create_window (app, NULL); - gtk_widget_show (GTK_WIDGET(window)); - - vinagre_utils_handle_debug (); - - for (l = servers; l; l = next) - { - VinagreConnection *conn = l->data; - - next = l->next; - vinagre_cmd_direct_connect (conn, window); - } - g_slist_free (servers); - - gtk_main (); - - g_object_unref (vinagre_bookmarks_get_default ()); - g_object_unref (vinagre_prefs_get_default ()); -#ifdef VINAGRE_ENABLE_AVAHI - g_object_unref (vinagre_mdns_get_default ()); -#endif - - return 0; -} -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-mdns.c vinagre-2.29.1/src/vinagre-mdns.c --- vinagre-2.26.1/src/vinagre-mdns.c 2008-12-11 19:08:03.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-mdns.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,253 +0,0 @@ -/* - * vinagre-mdns.c - * This file is part of vinagre - * - * Copyright (C) Jonh Wendell 2008 - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "vinagre-mdns.h" -#include "vinagre-connection.h" -#include "vinagre-bookmarks-entry.h" -#include -#include -#include - -struct _VinagreMdnsPrivate -{ - GSList *entries; - GaServiceBrowser *browser; - GaClient *client; -}; - -enum -{ - MDNS_CHANGED, - LAST_SIGNAL -}; - -G_DEFINE_TYPE (VinagreMdns, vinagre_mdns, G_TYPE_OBJECT); - -static VinagreMdns *mdns_singleton = NULL; -static guint signals[LAST_SIGNAL] = { 0 }; - -static void -mdns_resolver_found (GaServiceResolver *resolver, - AvahiIfIndex iface, - GaProtocol proto, - gchar *name, - gchar *type, - gchar *domain, - gchar *host_name, - AvahiAddress *a, - gint port, - AvahiStringList *txt, - GaLookupResultFlags flags, - VinagreMdns *mdns) -{ - VinagreConnection *conn; - VinagreBookmarksEntry *entry; - - conn = vinagre_connection_new (); - g_object_set (conn, - "name", name, - "port", port, - "host", host_name, - NULL); - entry = vinagre_bookmarks_entry_new_conn (conn); - g_object_unref (conn); - - mdns->priv->entries = g_slist_insert_sorted (mdns->priv->entries, - entry, - (GCompareFunc)vinagre_bookmarks_entry_compare); - - g_object_unref (resolver); - g_signal_emit (mdns, signals[MDNS_CHANGED], 0); -} - -static void -mdns_resolver_failure (GaServiceResolver *resolver, - GError *error, - VinagreMdns *mdns) -{ - g_warning ("%s", error->message); - g_object_unref (resolver); -} - -static void -mdns_browser_new_cb (GaServiceBrowser *browser, - AvahiIfIndex iface, - GaProtocol proto, - gchar *name, - gchar *type, - gchar *domain, - GaLookupResultFlags flags, - VinagreMdns *mdns) -{ - GaServiceResolver *resolver; - GError *error = NULL; - - resolver = ga_service_resolver_new (iface, - proto, - name, - type, - domain, - GA_PROTOCOL_UNSPEC, - GA_LOOKUP_NO_FLAGS); - - g_signal_connect (resolver, - "found", - G_CALLBACK (mdns_resolver_found), - mdns); - g_signal_connect (resolver, - "failure", - G_CALLBACK (mdns_resolver_failure), - mdns); - - if (!ga_service_resolver_attach (resolver, - mdns->priv->client, - &error)) - { - g_warning (_("Failed to resolve avahi hostname: %s\n"), error->message); - g_error_free (error); - } -} - -static void -mdns_browser_del_cb (GaServiceBrowser *browser, - AvahiIfIndex iface, - GaProtocol proto, - gchar *name, - gchar *type, - gchar *domain, - GaLookupResultFlags flags, - VinagreMdns *mdns) -{ - GSList *l; - - for (l = mdns->priv->entries; l; l = l->next) - { - VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (l->data); - if (strcmp (vinagre_connection_get_name (vinagre_bookmarks_entry_get_conn (entry)), name) == 0) - { - mdns->priv->entries = g_slist_remove (mdns->priv->entries, entry); - g_object_unref (entry); - g_signal_emit (mdns, signals[MDNS_CHANGED], 0); - return; - } - } -} - -static void -vinagre_mdns_init (VinagreMdns *mdns) -{ - GError *error = NULL; - - mdns->priv = G_TYPE_INSTANCE_GET_PRIVATE (mdns, VINAGRE_TYPE_MDNS, VinagreMdnsPrivate); - - mdns->priv->entries = NULL; - mdns->priv->browser = ga_service_browser_new ("_rfb._tcp"); - mdns->priv->client = ga_client_new (GA_CLIENT_FLAG_NO_FLAGS); - - g_signal_connect (mdns->priv->browser, - "new-service", - G_CALLBACK (mdns_browser_new_cb), - mdns); - g_signal_connect (mdns->priv->browser, - "removed-service", - G_CALLBACK (mdns_browser_del_cb), - mdns); - - if (!ga_client_start (mdns->priv->client, &error)) - { - g_warning (_("Failed to browse for hosts: %s\n"), error->message); - g_error_free (error); - return; - } - - if (!ga_service_browser_attach (mdns->priv->browser, - mdns->priv->client, - &error)) - { - g_warning (_("Failed to browse for hosts: %s\n"), error->message); - g_error_free (error); - } -} - -static void -vinagre_mdns_dispose (GObject *object) -{ - VinagreMdns *mdns = VINAGRE_MDNS (object); - - if (mdns->priv->browser) - { - g_object_unref (mdns->priv->browser); - mdns->priv->browser = NULL; - } - - if (mdns->priv->client) - { - g_object_unref (mdns->priv->client); - mdns->priv->client = NULL; - } - - if (mdns->priv->entries) - { - g_slist_foreach (mdns->priv->entries, (GFunc) g_object_unref, NULL); - g_slist_free (mdns->priv->entries); - mdns->priv->entries = NULL; - } - - G_OBJECT_CLASS (vinagre_mdns_parent_class)->dispose (object); -} - -static void -vinagre_mdns_class_init (VinagreMdnsClass *klass) -{ - GObjectClass* object_class = G_OBJECT_CLASS (klass); - GObjectClass* parent_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (VinagreMdnsPrivate)); - - object_class->dispose = vinagre_mdns_dispose; - - signals[MDNS_CHANGED] = - g_signal_new ("changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (VinagreMdnsClass, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - -} - -VinagreMdns * -vinagre_mdns_get_default (void) -{ - if (G_UNLIKELY (!mdns_singleton)) - mdns_singleton = VINAGRE_MDNS (g_object_new (VINAGRE_TYPE_MDNS, - NULL)); - return mdns_singleton; -} - -GSList * -vinagre_mdns_get_all (VinagreMdns *mdns) -{ - g_return_val_if_fail (VINAGRE_IS_MDNS (mdns), NULL); - - return mdns->priv->entries; -} diff -Nru vinagre-2.26.1/src/vinagre-mdns.h vinagre-2.29.1/src/vinagre-mdns.h --- vinagre-2.26.1/src/vinagre-mdns.h 2008-07-26 13:09:45.000000000 +0100 +++ vinagre-2.29.1/src/vinagre-mdns.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -/* - * vinagre-mdns.h - * This file is part of vinagre - * - * Copyright (C) Jonh Wendell 2008 - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef _VINAGRE_MDNS_H_ -#define _VINAGRE_MDNS_H_ - -#include -#include - -G_BEGIN_DECLS - -#define VINAGRE_TYPE_MDNS (vinagre_mdns_get_type ()) -#define VINAGRE_MDNS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_MDNS, VinagreMdns)) -#define VINAGRE_MDNS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_MDNS, VinagreMdnsClass)) -#define VINAGRE_IS_MDNS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_MDNS)) -#define VINAGRE_IS_MDNS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_MDNS)) -#define VINAGRE_MDNS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_MDNS, VinagreMdnsClass)) - -typedef struct _VinagreMdnsClass VinagreMdnsClass; -typedef struct _VinagreMdns VinagreMdns; -typedef struct _VinagreMdnsPrivate VinagreMdnsPrivate; - -struct _VinagreMdnsClass -{ - GObjectClass parent_class; - - /* Signals */ - void (* changed) (VinagreMdns *mdns); -}; - -struct _VinagreMdns -{ - GObject parent_instance; - VinagreMdnsPrivate *priv; -}; - -GType vinagre_mdns_get_type (void) G_GNUC_CONST; - -VinagreMdns *vinagre_mdns_get_default (void); -GSList *vinagre_mdns_get_all (VinagreMdns *mdns); - -G_END_DECLS - -#endif /* _VINAGRE_MDNS_H_ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-notebook.c vinagre-2.29.1/src/vinagre-notebook.c --- vinagre-2.26.1/src/vinagre-notebook.c 2008-12-11 18:02:43.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-notebook.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,339 +0,0 @@ -/* - * vinagre-notebook.c - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include - -#include "vinagre-notebook.h" -#include "vinagre-utils.h" -#include "vinagre-prefs.h" - -#define VINAGRE_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookPrivate)) - -struct _VinagreNotebookPrivate -{ - VinagreWindow *window; -}; - -G_DEFINE_TYPE(VinagreNotebook, vinagre_notebook, GTK_TYPE_NOTEBOOK) - -static void -vinagre_notebook_class_init (VinagreNotebookClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (object_class, sizeof(VinagreNotebookPrivate)); -} - -GtkWidget * -vinagre_notebook_new (VinagreWindow *window) -{ - VinagreNotebook *nb = g_object_new (VINAGRE_TYPE_NOTEBOOK, NULL); - - nb->priv->window = window; - return GTK_WIDGET (nb); -} - -void -vinagre_notebook_show_hide_tabs (VinagreNotebook *nb) -{ - gboolean always; - gint n; - - n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (nb)); - - g_object_get (vinagre_prefs_get_default (), - "always-show-tabs", &always, - NULL); - - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nb), - (n > 1) || (always)); -} - -static void -drag_data_get_handl (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint target_type, - guint time, - VinagreTab *tab) -{ - gchar *uri, *name, *data; - VinagreConnection *conn; - - g_assert (selection_data != NULL); - - switch (target_type) - { - case TARGET_VINAGRE: - conn = vinagre_tab_get_conn (tab); - uri = vinagre_connection_get_string_rep (conn, TRUE); - name = vinagre_connection_get_best_name (conn); - data = g_strdup_printf ("%s||%s", name, uri); - - gtk_selection_data_set (selection_data, - selection_data->target, - 8, - (guchar*) data, - strlen (data)); - - g_free (data); - g_free (name); - g_free (uri); - break; - - case TARGET_STRING: - /*FIXME: Create a .VNC file*/ - break; - - default: - g_assert_not_reached (); - } -} - -static void -vinagre_notebook_init (VinagreNotebook *notebook) -{ - notebook->priv = VINAGRE_NOTEBOOK_GET_PRIVATE (notebook); - - gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE); - - g_signal_connect (notebook, - "page-added", - G_CALLBACK (vinagre_notebook_show_hide_tabs), - NULL); - g_signal_connect (notebook, - "page-removed", - G_CALLBACK (vinagre_notebook_show_hide_tabs), - NULL); - g_signal_connect_swapped (vinagre_prefs_get_default (), - "notify::always-show-tabs", - G_CALLBACK (vinagre_notebook_show_hide_tabs), - notebook); -} - -static void -close_button_clicked_cb (GtkWidget *widget, - GtkWidget *tab) -{ - VinagreNotebook *notebook; - - notebook = VINAGRE_NOTEBOOK (gtk_widget_get_parent (tab)); - vinagre_notebook_remove_tab (notebook, VINAGRE_TAB (tab)); -} - -static void -tab_size_changed_cb (VinagreTab *tab, VinagreNotebook *nb) -{ - char *str; - GtkWidget *label; - - label = GTK_WIDGET (g_object_get_data (G_OBJECT (tab), "label-ebox")); - g_return_if_fail (label != NULL); - - str = vinagre_tab_get_tooltips (tab); - gtk_widget_set_tooltip_markup (label, str); - - g_free (str); -} - -static void -tab_disconnected_cb (VinagreTab *tab, VinagreNotebook *nb) -{ - gchar *message, *name; - - name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab)); - message = g_strdup_printf (_("Connection to host %s was closed."), - name); - vinagre_utils_show_error (_("Connection closed"), message, GTK_WINDOW (nb->priv->window)); - g_free (message); - g_free (name); - - vinagre_notebook_remove_tab (nb, tab); -} - -static GtkWidget * -build_tab_label (VinagreNotebook *nb, - VinagreTab *tab) -{ - GtkWidget *hbox, *label_hbox, *label_ebox; - GtkWidget *label, *dummy_label; - GtkWidget *close_button; - GtkRcStyle *rcstyle; - GtkWidget *image; - GtkWidget *icon; - gchar *name; - - hbox = gtk_hbox_new (FALSE, 4); - - label_ebox = gtk_event_box_new (); - gtk_event_box_set_visible_window (GTK_EVENT_BOX (label_ebox), FALSE); - gtk_box_pack_start (GTK_BOX (hbox), label_ebox, TRUE, TRUE, 0); - gtk_widget_set_tooltip_text (label_ebox, _("Connecting...")); - - label_hbox = gtk_hbox_new (FALSE, 4); - gtk_container_add (GTK_CONTAINER (label_ebox), label_hbox); - - /* setup close button */ - close_button = gtk_button_new (); - gtk_button_set_relief (GTK_BUTTON (close_button), - GTK_RELIEF_NONE); - - /* don't allow focus on the close button */ - gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); - - /* make it as small as possible */ - rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style (close_button, rcstyle); - g_object_unref (rcstyle); - gint w, h; - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); - gtk_widget_set_size_request (GTK_WIDGET (close_button), w+2, h+2); - - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, - GTK_ICON_SIZE_MENU); - gtk_container_add (GTK_CONTAINER (close_button), image); - gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); - - gtk_widget_set_tooltip_text (close_button, _("Close connection")); - - g_signal_connect (close_button, - "clicked", - G_CALLBACK (close_button_clicked_cb), - tab); - - /* setup site icon, empty by default */ - icon = gtk_image_new (); - gtk_box_pack_start (GTK_BOX (label_hbox), icon, FALSE, FALSE, 0); - - /* setup label */ - name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab)); - label = gtk_label_new (name); - g_free (name); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_misc_set_padding (GTK_MISC (label), 0, 0); - gtk_box_pack_start (GTK_BOX (label_hbox), label, FALSE, FALSE, 0); - - dummy_label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (label_hbox), dummy_label, TRUE, TRUE, 0); - - gtk_widget_show (hbox); - gtk_widget_show (label_ebox); - gtk_widget_show (label_hbox); - gtk_widget_show (label); - gtk_widget_show (dummy_label); - gtk_widget_show (image); - gtk_widget_show (close_button); - gtk_widget_show (icon); - - g_object_set_data (G_OBJECT (hbox), "label", label); - g_object_set_data (G_OBJECT (tab), "label", label); - g_object_set_data (G_OBJECT (hbox), "label-ebox", label_ebox); - g_object_set_data (G_OBJECT (tab), "label-ebox", label_ebox); - g_object_set_data (G_OBJECT (hbox), "icon", icon); - g_object_set_data (G_OBJECT (hbox), "close-button", close_button); - g_object_set_data (G_OBJECT (tab), "close-button", close_button); - - g_signal_connect (tab, - "notify::original-width", - G_CALLBACK (tab_size_changed_cb), - nb); - - g_signal_connect (tab, - "tab-disconnected", - G_CALLBACK (tab_disconnected_cb), - nb); - - gtk_drag_source_set ( GTK_WIDGET (hbox), - GDK_BUTTON1_MASK, - vinagre_target_list, - vinagre_n_targets, - GDK_ACTION_COPY ); - g_signal_connect (hbox, - "drag-data-get", - G_CALLBACK (drag_data_get_handl), - tab); - - return hbox; -} - -void -vinagre_notebook_add_tab (VinagreNotebook *nb, - VinagreTab *tab, - gint position) -{ - GtkWidget *label; - int pos; - - g_return_if_fail (VINAGRE_IS_NOTEBOOK (nb)); - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - label = build_tab_label (nb, tab); - - pos = gtk_notebook_insert_page (GTK_NOTEBOOK (nb), - GTK_WIDGET (tab), - label, - position); - - gtk_notebook_set_current_page (GTK_NOTEBOOK (nb), pos); - vinagre_tab_set_notebook (tab, nb); -} - -static void -remove_tab (VinagreTab *tab, - VinagreNotebook *nb) -{ - vinagre_notebook_remove_tab (nb, tab); -} - -void -vinagre_notebook_remove_tab (VinagreNotebook *nb, - VinagreTab *tab) -{ - gint position; - - g_return_if_fail (VINAGRE_IS_NOTEBOOK (nb)); - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - position = gtk_notebook_page_num (GTK_NOTEBOOK (nb), GTK_WIDGET (tab)); - - g_signal_handlers_disconnect_by_func (tab, - G_CALLBACK (tab_disconnected_cb), - nb); - - gtk_notebook_remove_page (GTK_NOTEBOOK (nb), position); -} - -void -vinagre_notebook_remove_all_tabs (VinagreNotebook *nb) -{ - g_return_if_fail (VINAGRE_IS_NOTEBOOK (nb)); - - gtk_container_foreach (GTK_CONTAINER (nb), - (GtkCallback) remove_tab, - nb); -} -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-notebook.h vinagre-2.29.1/src/vinagre-notebook.h --- vinagre-2.26.1/src/vinagre-notebook.h 2008-07-26 13:09:45.000000000 +0100 +++ vinagre-2.29.1/src/vinagre-notebook.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,100 +0,0 @@ -/* - * vinagre-notebook.h - * This file is part of vinagre - * - * Copyright (C) 2007 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_NOTEBOOK_H__ -#define __VINAGRE_NOTEBOOK_H__ - -#include -#include - -G_BEGIN_DECLS - -/* - * Type checking and casting macros - */ -#define VINAGRE_TYPE_NOTEBOOK (vinagre_notebook_get_type ()) -#define VINAGRE_NOTEBOOK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), VINAGRE_TYPE_NOTEBOOK, VinagreNotebook)) -#define VINAGRE_NOTEBOOK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookClass)) -#define VINAGRE_IS_NOTEBOOK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), VINAGRE_TYPE_NOTEBOOK)) -#define VINAGRE_IS_NOTEBOOK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), VINAGRE_TYPE_NOTEBOOK)) -#define VINAGRE_NOTEBOOK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookClass)) - -/* Private structure type */ -typedef struct _VinagreNotebookPrivate VinagreNotebookPrivate; - -/* - * Main object structure - */ -typedef struct _VinagreNotebook VinagreNotebook; - -#include "vinagre-window.h" -#include "vinagre-tab.h" - -struct _VinagreNotebook -{ - GtkNotebook notebook; - - /*< private >*/ - VinagreNotebookPrivate *priv; -}; - -/* - * Class definition - */ -typedef struct _VinagreNotebookClass VinagreNotebookClass; - -struct _VinagreNotebookClass -{ - GtkNotebookClass parent_class; - - /* Signals */ - void (* tab_added) (VinagreNotebook *notebook, - VinagreTab *tab); - void (* tab_removed) (VinagreNotebook *notebook, - VinagreTab *tab); - void (* tab_detached) (VinagreNotebook *notebook, - VinagreTab *tab); - void (* tabs_reordered) (VinagreNotebook *notebook); - void (* tab_close_request) - (VinagreNotebook *notebook, - VinagreTab *tab); -}; - -/* - * Public methods - */ -GType vinagre_notebook_get_type (void) G_GNUC_CONST; - -GtkWidget *vinagre_notebook_new (VinagreWindow *window); - -void vinagre_notebook_add_tab (VinagreNotebook *nb, - VinagreTab *tab, - gint position); - -void vinagre_notebook_remove_tab (VinagreNotebook *nb, - VinagreTab *tab); - -void vinagre_notebook_remove_all_tabs (VinagreNotebook *nb); - -void vinagre_notebook_show_hide_tabs (VinagreNotebook *nb); -G_END_DECLS - -#endif /* __VINAGRE_NOTEBOOK_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-prefs.c vinagre-2.29.1/src/vinagre-prefs.c --- vinagre-2.26.1/src/vinagre-prefs.c 2008-12-11 19:16:49.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-prefs.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,470 +0,0 @@ -/* - * vinagre-prefs.c - * This file is part of vinagre - * - * Copyright (C) Jonh Wendell 2008 - * - * vinagre-prefs.c 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. - * - * vinagre-prefs.c 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. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include -#include -#include -#include "vinagre-prefs.h" -#include "vinagre-utils.h" - -#define VINAGRE_BASE_KEY "/apps/vinagre" -#define VM_ALWAYS_SHOW_TABS VINAGRE_BASE_KEY "/always_show_tabs" -#define VM_SHARED_FLAG VINAGRE_BASE_KEY "/shared_flag" -#define VM_TOOLBAR_VISIBLE VINAGRE_BASE_KEY "/toolbar_visible" -#define VM_STATUSBAR_VISIBLE VINAGRE_BASE_KEY "/statusbar_visible" -#define VM_SIDE_PANEL_VISIBLE VINAGRE_BASE_KEY "/side_pane_visible" -#define VM_SHOW_ACCELS VINAGRE_BASE_KEY "/show_accels" -#define VM_HISTORY_SIZE VINAGRE_BASE_KEY "/history_size" - -#define VM_WINDOW_STATE VINAGRE_BASE_KEY "/window_state" -#define VM_WINDOW_WIDTH VINAGRE_BASE_KEY "/window_width" -#define VM_WINDOW_HEIGHT VINAGRE_BASE_KEY "/window_height" -#define VM_SIDE_PANEL_SIZE VINAGRE_BASE_KEY "/side_panel_size" - -struct _VinagrePrefsPrivate -{ - GConfClient *gconf_client; -}; - -/* Properties */ -enum -{ - PROP_0, - PROP_SHARED_FLAG, - PROP_ALWAYS_SHOW_TABS, - PROP_TOOLBAR_VISIBLE, - PROP_STATUSBAR_VISIBLE, - PROP_SIDE_PANEL_VISIBLE, - PROP_WINDOW_STATE, - PROP_WINDOW_WIDTH, - PROP_WINDOW_HEIGHT, - PROP_SIDE_PANEL_SIZE, - PROP_SHOW_ACCELS, - PROP_HISTORY_SIZE -}; - -G_DEFINE_TYPE (VinagrePrefs, vinagre_prefs, G_TYPE_OBJECT); - -static VinagrePrefs *prefs_singleton = NULL; - -VinagrePrefs * -vinagre_prefs_get_default (void) -{ - if (G_UNLIKELY (!prefs_singleton)) - prefs_singleton = VINAGRE_PREFS (g_object_new (VINAGRE_TYPE_PREFS, - NULL)); - return prefs_singleton; -} - -static gboolean -vinagre_prefs_get_bool (VinagrePrefs *prefs, const gchar* key, gboolean def) -{ - GError* error = NULL; - GConfValue* val; - - val = gconf_client_get (prefs->priv->gconf_client, key, &error); - - if (val != NULL) - { - gboolean retval = def; - - g_return_val_if_fail (error == NULL, retval); - - if (val->type == GCONF_VALUE_BOOL) - retval = gconf_value_get_bool (val); - - gconf_value_free (val); - - return retval; - } - else - return def; -} - -static gboolean -vinagre_prefs_get_int (VinagrePrefs *prefs, const gchar* key, gint def) -{ - GError* error = NULL; - GConfValue* val; - - val = gconf_client_get (prefs->priv->gconf_client, key, &error); - - if (val != NULL) - { - gint retval = def; - - g_return_val_if_fail (error == NULL, retval); - - if (val->type == GCONF_VALUE_INT) - retval = gconf_value_get_int (val); - - gconf_value_free (val); - - return retval; - } - else - return def; -} - -static void -vinagre_prefs_set_bool (VinagrePrefs *prefs, const gchar* key, gboolean value) -{ - g_return_if_fail (gconf_client_key_is_writable ( - prefs->priv->gconf_client, key, NULL)); - - gconf_client_set_bool (prefs->priv->gconf_client, key, value, NULL); -} - -static void -vinagre_prefs_set_int (VinagrePrefs *prefs, const gchar* key, gint value) -{ - g_return_if_fail (gconf_client_key_is_writable ( - prefs->priv->gconf_client, key, NULL)); - - gconf_client_set_int (prefs->priv->gconf_client, key, value, NULL); -} - -static void -vinagre_prefs_always_show_tabs_notify (GConfClient *client, - guint cnx_id, - GConfEntry *entry, - VinagrePrefs *prefs) -{ - g_object_notify (G_OBJECT (prefs), "always-show-tabs"); -} - -static void -vinagre_prefs_show_accels_notify (GConfClient *client, - guint cnx_id, - GConfEntry *entry, - VinagrePrefs *prefs) -{ - g_object_notify (G_OBJECT (prefs), "show-accels"); -} - -static void -vinagre_prefs_init (VinagrePrefs *prefs) -{ - prefs->priv = G_TYPE_INSTANCE_GET_PRIVATE (prefs, VINAGRE_TYPE_PREFS, VinagrePrefsPrivate); - - prefs->priv->gconf_client = gconf_client_get_default (); - if (prefs->priv->gconf_client == NULL) - g_critical (_("Cannot initialize preferences manager.")); - - gconf_client_add_dir (prefs->priv->gconf_client, - VINAGRE_BASE_KEY, - GCONF_CLIENT_PRELOAD_ONELEVEL, - NULL); - - gconf_client_notify_add (prefs->priv->gconf_client, - VM_ALWAYS_SHOW_TABS, - (GConfClientNotifyFunc) vinagre_prefs_always_show_tabs_notify, - prefs, NULL, NULL); - gconf_client_notify_add (prefs->priv->gconf_client, - VM_SHOW_ACCELS, - (GConfClientNotifyFunc) vinagre_prefs_show_accels_notify, - prefs, NULL, NULL); - -} - -static void -vinagre_prefs_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) -{ - VinagrePrefs *prefs = VINAGRE_PREFS (object); - - switch (prop_id) - { - case PROP_SHARED_FLAG: - vinagre_prefs_set_bool (prefs, VM_SHARED_FLAG, g_value_get_boolean (value)); - break; - case PROP_ALWAYS_SHOW_TABS: - vinagre_prefs_set_bool (prefs, VM_ALWAYS_SHOW_TABS, g_value_get_boolean (value)); - break; - case PROP_TOOLBAR_VISIBLE: - vinagre_prefs_set_bool (prefs, VM_TOOLBAR_VISIBLE, g_value_get_boolean (value)); - break; - case PROP_STATUSBAR_VISIBLE: - vinagre_prefs_set_bool (prefs, VM_STATUSBAR_VISIBLE, g_value_get_boolean (value)); - break; - case PROP_SIDE_PANEL_VISIBLE: - vinagre_prefs_set_bool (prefs, VM_SIDE_PANEL_VISIBLE, g_value_get_boolean (value)); - break; - case PROP_WINDOW_STATE: - vinagre_prefs_set_int (prefs, VM_WINDOW_STATE, g_value_get_int (value)); - break; - case PROP_WINDOW_WIDTH: - vinagre_prefs_set_int (prefs, VM_WINDOW_WIDTH, g_value_get_int (value)); - break; - case PROP_WINDOW_HEIGHT: - vinagre_prefs_set_int (prefs, VM_WINDOW_HEIGHT, g_value_get_int (value)); - break; - case PROP_SIDE_PANEL_SIZE: - vinagre_prefs_set_int (prefs, VM_SIDE_PANEL_SIZE, g_value_get_int (value)); - break; - case PROP_SHOW_ACCELS: - vinagre_prefs_set_bool (prefs, VM_SHOW_ACCELS, g_value_get_boolean (value)); - break; - case PROP_HISTORY_SIZE: - vinagre_prefs_set_int (prefs, VM_HISTORY_SIZE, g_value_get_int (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -vinagre_prefs_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) -{ - VinagrePrefs *prefs = VINAGRE_PREFS (object); - - switch (prop_id) - { - case PROP_SHARED_FLAG: - g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_SHARED_FLAG, TRUE)); - break; - case PROP_ALWAYS_SHOW_TABS: - g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_ALWAYS_SHOW_TABS, FALSE)); - break; - case PROP_TOOLBAR_VISIBLE: - g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_TOOLBAR_VISIBLE, TRUE)); - break; - case PROP_STATUSBAR_VISIBLE: - g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_STATUSBAR_VISIBLE, TRUE)); - break; - case PROP_SIDE_PANEL_VISIBLE: - g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_SIDE_PANEL_VISIBLE, TRUE)); - break; - case PROP_WINDOW_STATE: - g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_WINDOW_STATE, 0)); - break; - case PROP_WINDOW_WIDTH: - g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_WINDOW_WIDTH, 650)); - break; - case PROP_WINDOW_HEIGHT: - g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_WINDOW_HEIGHT, 500)); - break; - case PROP_SIDE_PANEL_SIZE: - g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_SIDE_PANEL_SIZE, 200)); - break; - case PROP_SHOW_ACCELS: - g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_SHOW_ACCELS, TRUE)); - break; - case PROP_HISTORY_SIZE: - g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_HISTORY_SIZE, 15)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -vinagre_prefs_dispose (GObject *object) -{ - VinagrePrefs *prefs = VINAGRE_PREFS (object); - - if (prefs->priv->gconf_client) - { - gconf_client_remove_dir (prefs->priv->gconf_client, - VINAGRE_BASE_KEY, - NULL); - g_object_unref (prefs->priv->gconf_client); - prefs->priv->gconf_client = NULL; - } - - G_OBJECT_CLASS (vinagre_prefs_parent_class)->dispose (object); -} - - -static void -vinagre_prefs_class_init (VinagrePrefsClass *klass) -{ - GObjectClass* object_class = G_OBJECT_CLASS (klass); - GObjectClass* parent_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (VinagrePrefsPrivate)); - - object_class->dispose = vinagre_prefs_dispose; - object_class->set_property = vinagre_prefs_set_property; - object_class->get_property = vinagre_prefs_get_property; - - g_object_class_install_property (object_class, - PROP_SHARED_FLAG, - g_param_spec_boolean ("shared-flag", - "Shared Flag", - "Whether we should share the remote connection", - TRUE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_ALWAYS_SHOW_TABS, - g_param_spec_boolean ("always-show-tabs", - "Always show tabs", - "Whether we should show the tabs even when there is ony one active connection", - FALSE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_TOOLBAR_VISIBLE, - g_param_spec_boolean ("toolbar-visible", - "Toolbar Visibility", - "Whether the toolbar is visible", - TRUE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_STATUSBAR_VISIBLE, - g_param_spec_boolean ("statusbar-visible", - "Statusbar Visibility", - "Whether the statusbar is visible", - TRUE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_SIDE_PANEL_VISIBLE, - g_param_spec_boolean ("side-panel-visible", - "Side Panel Visibility", - "Whether the side panel is visible", - TRUE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_WINDOW_STATE, - g_param_spec_int ("window-state", - "Window State", - "Whether the window is maximised", - G_MININT, G_MAXINT, 0, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_WINDOW_WIDTH, - g_param_spec_int ("window-width", - "Window Width", - "The width of window", - 100, G_MAXINT, 650, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_WINDOW_HEIGHT, - g_param_spec_int ("window-height", - "Window Height", - "The height of window", - 100, G_MAXINT, 500, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_SIDE_PANEL_SIZE, - g_param_spec_int ("side-panel-size", - "Side Panel Width", - "The width of side panel", - 100, G_MAXINT, 200, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_SHOW_ACCELS, - g_param_spec_boolean ("show-accels", - "Show menu accelerators", - "Whether we should show the menu accelerators (keyboard shortcuts)", - FALSE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_HISTORY_SIZE, - g_param_spec_int ("history-size", - "History size", - "Max number of items in history dropdown entry", - 0, G_MAXINT, 15, - G_PARAM_READWRITE)); - -} - -/* Preferences dialog */ - -typedef struct { - GladeXML *xml; - GtkWidget *dialog; - GtkWidget *show_tabs; - GtkWidget *show_accels; -} VinagrePrefsDialog; - -static void -vinagre_prefs_dialog_setup (VinagrePrefsDialog *dialog) -{ - gboolean show_accels, show_tabs; - - g_object_get (vinagre_prefs_get_default (), - "show-accels", &show_accels, - "always-show-tabs", &show_tabs, - NULL); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->show_accels), show_accels); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->show_tabs), show_tabs); -} - -static void -vinagre_prefs_dialog_quit (VinagrePrefsDialog *dialog) -{ - gtk_widget_destroy (dialog->dialog); - g_object_unref (dialog->xml); - g_free (dialog); - dialog = NULL; -} - -static void -vinagre_prefs_dialog_show_tabs_cb (VinagrePrefsDialog *dialog) -{ - g_object_set (vinagre_prefs_get_default (), - "always-show-tabs", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->show_tabs)), - NULL); -} - -static void -vinagre_prefs_dialog_show_accels_cb (VinagrePrefsDialog *dialog) -{ - g_object_set (vinagre_prefs_get_default (), - "show-accels", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->show_accels)), - NULL); -} - -void -vinagre_prefs_dialog_show (VinagreWindow *window) -{ - VinagrePrefsDialog *dialog; - - dialog = g_new (VinagrePrefsDialog, 1); - - dialog->xml = glade_xml_new (vinagre_utils_get_glade_filename (), NULL, NULL); - dialog->dialog = glade_xml_get_widget (dialog->xml, "preferences_dialog"); - gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog), GTK_WINDOW (window)); - - dialog->show_tabs = glade_xml_get_widget (dialog->xml, "always_show_tabs_check"); - dialog->show_accels = glade_xml_get_widget (dialog->xml, "show_accels_check"); - - vinagre_prefs_dialog_setup (dialog); - - g_signal_connect_swapped (dialog->dialog, - "response", - G_CALLBACK (vinagre_prefs_dialog_quit), - dialog); - - g_signal_connect_swapped (dialog->show_tabs, - "toggled", - G_CALLBACK (vinagre_prefs_dialog_show_tabs_cb), - dialog); - - g_signal_connect_swapped (dialog->show_accels, - "toggled", - G_CALLBACK (vinagre_prefs_dialog_show_accels_cb), - dialog); - - gtk_widget_show_all (dialog->dialog); -} -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-prefs.h vinagre-2.29.1/src/vinagre-prefs.h --- vinagre-2.26.1/src/vinagre-prefs.h 2008-11-14 20:47:29.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-prefs.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -/* - * vinagre-prefs.c - * This file is part of vinagre - * - * Copyright (C) Jonh Wendell 2008 - * - * vinagre-prefs.c 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. - * - * vinagre-prefs.c 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. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef _VINAGRE_PREFS_H_ -#define _VINAGRE_PREFS_H_ - -#include -#include "vinagre-window.h" - -G_BEGIN_DECLS - -#define VINAGRE_TYPE_PREFS (vinagre_prefs_get_type ()) -#define VINAGRE_PREFS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_PREFS, VinagrePrefs)) -#define VINAGRE_PREFS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_PREFS, VinagrePrefsClass)) -#define VINAGRE_IS_PREFS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_PREFS)) -#define VINAGRE_IS_PREFS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_PREFS)) -#define VINAGRE_PREFS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_PREFS, VinagrePrefsClass)) - -typedef struct _VinagrePrefsClass VinagrePrefsClass; -typedef struct _VinagrePrefs VinagrePrefs; -typedef struct _VinagrePrefsPrivate VinagrePrefsPrivate; - -struct _VinagrePrefsClass -{ - GObjectClass parent_class; -}; - -struct _VinagrePrefs -{ - GObject parent_instance; - VinagrePrefsPrivate *priv; -}; - -GType vinagre_prefs_get_type (void) G_GNUC_CONST; - -VinagrePrefs *vinagre_prefs_get_default (void); - -void vinagre_prefs_dialog_show (VinagreWindow *window); -G_END_DECLS - -#endif /* _VINAGRE_PREFS_H_ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-tab.c vinagre-2.29.1/src/vinagre-tab.c --- vinagre-2.26.1/src/vinagre-tab.c 2009-02-20 17:56:05.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-tab.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1354 +0,0 @@ -/* - * vinagre-tab.c - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include - -#include "vinagre-notebook.h" -#include "vinagre-tab.h" -#include "vinagre-utils.h" -#include "vinagre-prefs.h" -#include "view/autoDrawer.h" - -#define VINAGRE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_TAB, VinagreTabPrivate)) - -struct _VinagreTabPrivate -{ - GtkWidget *vnc; - GtkWidget *scroll; - VinagreConnection *conn; - VinagreNotebook *nb; - VinagreWindow *window; - gboolean save_credential; - guint32 keyring_item_id; - VinagreTabState state; - gchar *clipboard_str; - GtkWidget *layout; - GtkWidget *toolbar; - GtkWidget *ro_button; - GtkWidget *scaling_button; - gboolean pointer_grab; -}; - -G_DEFINE_TYPE(VinagreTab, vinagre_tab, GTK_TYPE_VBOX) - -/* Signals */ -enum -{ - TAB_CONNECTED, - TAB_DISCONNECTED, - TAB_INITIALIZED, - LAST_SIGNAL -}; - -/* Properties */ -enum -{ - PROP_0, - PROP_CONN, - PROP_WINDOW, - PROP_ORIGINAL_WIDTH, - PROP_ORIGINAL_HEIGHT -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -static gboolean -vinagre_tab_window_state_cb (GtkWidget *widget, - GdkEventWindowState *event, - VinagreTab *tab) -{ - int vnc_w, vnc_h, screen_w, screen_h; - GdkScreen *screen; - GtkPolicyType h, v; - - if ((event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) == 0) - return FALSE; - - vnc_w = vnc_display_get_width (VNC_DISPLAY (tab->priv->vnc)); - vnc_h = vnc_display_get_height (VNC_DISPLAY (tab->priv->vnc)); - - screen = gtk_widget_get_screen (GTK_WIDGET (tab)); - screen_w = gdk_screen_get_width (screen); - screen_h = gdk_screen_get_height (screen); - - if (vnc_w <= screen_w) - h = GTK_POLICY_NEVER; - else - h = GTK_POLICY_AUTOMATIC; - - if (vnc_h <= screen_h) - v = GTK_POLICY_NEVER; - else - v = GTK_POLICY_AUTOMATIC; - - if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) - { - gtk_widget_show (tab->priv->toolbar); - ViewAutoDrawer_SetActive (VIEW_AUTODRAWER (tab->priv->layout), TRUE); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tab->priv->scroll), - h, v); - } - else - { - gtk_widget_hide (tab->priv->toolbar); - ViewAutoDrawer_SetActive (VIEW_AUTODRAWER (tab->priv->layout), FALSE); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tab->priv->scroll), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - vinagre_notebook_show_hide_tabs (tab->priv->nb); - } - - return FALSE; -} - -static void -vinagre_tab_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - VinagreTab *tab = VINAGRE_TAB (object); - - switch (prop_id) - { - case PROP_CONN: - g_value_set_object (value, tab->priv->conn); - break; - case PROP_WINDOW: - g_value_set_object (value, tab->priv->window); - break; - case PROP_ORIGINAL_WIDTH: - g_value_set_int (value, vinagre_tab_get_original_width (tab)); - break; - case PROP_ORIGINAL_HEIGHT: - g_value_set_int (value, vinagre_tab_get_original_height (tab)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -vinagre_tab_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - VinagreTab *tab = VINAGRE_TAB (object); - - switch (prop_id) - { - case PROP_CONN: - tab->priv->conn = g_value_get_object (value); - g_object_set_data (G_OBJECT (tab->priv->conn), VINAGRE_TAB_KEY, tab); - break; - case PROP_WINDOW: - tab->priv->window = g_value_get_object (value); - g_signal_connect (tab->priv->window, - "window-state-event", - G_CALLBACK (vinagre_tab_window_state_cb), - tab); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -vinagre_tab_finalize (GObject *object) -{ - VinagreTab *tab = VINAGRE_TAB (object); - - g_free (tab->priv->clipboard_str); - - G_OBJECT_CLASS (vinagre_tab_parent_class)->finalize (object); -} - -static void -vinagre_tab_dispose (GObject *object) -{ - VinagreTab *tab = VINAGRE_TAB (object); - - if (tab->priv->conn) - { - g_signal_handlers_disconnect_by_func (tab->priv->window, - vinagre_tab_window_state_cb, - tab); - - g_object_unref (tab->priv->conn); - tab->priv->conn = NULL; - } - - G_OBJECT_CLASS (vinagre_tab_parent_class)->dispose (object); -} - -static void -vinagre_tab_class_init (VinagreTabClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = vinagre_tab_finalize; - object_class->dispose = vinagre_tab_dispose; - object_class->get_property = vinagre_tab_get_property; - object_class->set_property = vinagre_tab_set_property; - - g_object_class_install_property (object_class, - PROP_CONN, - g_param_spec_object ("conn", - "Connection", - "The connection", - VINAGRE_TYPE_CONNECTION, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - g_object_class_install_property (object_class, - PROP_WINDOW, - g_param_spec_object ("window", - "Window", - "The VinagreWindow", - VINAGRE_TYPE_WINDOW, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_ORIGINAL_WIDTH, - g_param_spec_int ("original-width", - "Original width", - "The original width of the remote screen", - -1, G_MAXINT, 0, - G_PARAM_READABLE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - - g_object_class_install_property (object_class, - PROP_ORIGINAL_HEIGHT, - g_param_spec_int ("original-height", - "Original height", - "The original height of the remote screen", - -1, G_MAXINT, 0, - G_PARAM_READABLE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - - signals[TAB_CONNECTED] = - g_signal_new ("tab-connected", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (VinagreTabClass, tab_connected), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - signals[TAB_DISCONNECTED] = - g_signal_new ("tab-disconnected", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (VinagreTabClass, tab_disconnected), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - signals[TAB_INITIALIZED] = - g_signal_new ("tab-initialized", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (VinagreTabClass, tab_initialized), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - g_type_class_add_private (object_class, sizeof (VinagreTabPrivate)); -} - -static void -open_vnc (VinagreTab *tab) -{ - gchar *port; - gint shared; - - vnc_display_set_force_size (VNC_DISPLAY(tab->priv->vnc), - !vinagre_connection_get_scaling (tab->priv->conn)); - - port = g_strdup_printf ("%d", vinagre_connection_get_port (tab->priv->conn)); - - shared = vinagre_connection_get_shared (tab->priv->conn); - if (shared == -1) - g_object_get (vinagre_prefs_get_default (), - "shared-flag", &shared, - NULL); - vnc_display_set_shared_flag (VNC_DISPLAY (tab->priv->vnc), - shared); - - if (vnc_display_open_host (VNC_DISPLAY(tab->priv->vnc), vinagre_connection_get_host (tab->priv->conn), port)) - gtk_widget_grab_focus (tab->priv->vnc); - else - vinagre_utils_show_error (NULL, _("Error connecting to host."), NULL); - - g_free (port); -} - -static void -vnc_connected_cb (VncDisplay *vnc, VinagreTab *tab) -{ - /* Emits the signal saying that we have connected to the machine */ - g_signal_emit (G_OBJECT (tab), - signals[TAB_CONNECTED], - 0); -} - -static void -vnc_disconnected_cb (VncDisplay *vnc, VinagreTab *tab) -{ - /* Emits the signal saying that we have disconnected from the machine */ - g_signal_emit (G_OBJECT (tab), - signals[TAB_DISCONNECTED], - 0); -} - -static void -vnc_auth_failed_cb (VncDisplay *vnc, const gchar *msg, VinagreTab *tab) -{ - GString *message; - gchar *name; - - message = g_string_new (NULL); - name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab)); - - g_string_printf (message, _("Authentication to host %s has failed"), - name); - if (msg) - g_string_append_printf (message, " (%s)", msg); - g_string_append_c (message, '.'); - - vinagre_utils_show_error (_("Authentication failed"), message->str, GTK_WINDOW (tab->priv->window)); - g_string_free (message, TRUE); - g_free (name); - - if (tab->priv->keyring_item_id > 0) - { - gnome_keyring_item_delete_sync (NULL, tab->priv->keyring_item_id); - tab->priv->keyring_item_id = 0; - } - - vinagre_notebook_remove_tab (tab->priv->nb, tab); -} - -static void -vnc_auth_unsupported_cb (VncDisplay *vnc, guint auth_type, VinagreTab *tab) -{ - GString *message; - gchar *name; - - message = g_string_new (NULL); - name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab)); - - g_string_printf (message, _("Authentication method to host %s is unsupported. (%u)"), - name, - auth_type); - - vinagre_utils_show_error (_("Authentication unsupported"), message->str, GTK_WINDOW (tab->priv->window)); - g_string_free (message, TRUE); - g_free (name); - - vinagre_notebook_remove_tab (tab->priv->nb, tab); -} - -/* text was actually requested */ -static void -copy_cb (GtkClipboard *clipboard, - GtkSelectionData *data, - guint info, - VinagreTab *tab) -{ - gtk_selection_data_set_text (data, tab->priv->clipboard_str, -1); -} - -static void -vnc_server_cut_text_cb (VncDisplay *vnc, const gchar *text, VinagreTab *tab) -{ - GtkClipboard *cb; - gsize a, b; - GtkTargetEntry targets[] = { - {"UTF8_STRING", 0, 0}, - {"COMPOUND_TEXT", 0, 0}, - {"TEXT", 0, 0}, - {"STRING", 0, 0}, - }; - - if (!text) - return; - - g_free (tab->priv->clipboard_str); - tab->priv->clipboard_str = g_convert (text, -1, "utf-8", "iso8859-1", &a, &b, NULL); - - if (tab->priv->clipboard_str) - { - cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - - gtk_clipboard_set_with_owner (cb, - targets, - G_N_ELEMENTS(targets), - (GtkClipboardGetFunc) copy_cb, - NULL, - G_OBJECT (tab)); - } -} - -static void -vinagre_tab_add_recent_used (VinagreTab *tab) -{ - GtkRecentManager *manager; - GtkRecentData *data; - gchar *uri; - - static gchar *groups[2] = { - "vinagre", - NULL - }; - - manager = gtk_recent_manager_get_default (); - data = g_slice_new (GtkRecentData); - - uri = vinagre_connection_get_string_rep (tab->priv->conn, TRUE); - data->display_name = vinagre_connection_get_best_name (tab->priv->conn); - data->description = NULL; - data->mime_type = g_strdup ("application/x-remote-connection"); - data->app_name = (gchar *) g_get_application_name (); - data->app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL); - data->groups = groups; - data->is_private = FALSE; - - if (!gtk_recent_manager_add_full (manager, uri, data)) - vinagre_utils_show_error (NULL, - _("Error saving recent connection."), - GTK_WINDOW (tab->priv->window)); - - g_free (uri); - g_free (data->app_exec); - g_free (data->mime_type); - g_free (data->display_name); - g_slice_free (GtkRecentData, data); -} - -static void -vinagre_tab_save_credential (VinagreTab *tab) -{ - GnomeKeyringResult result; - - if (!tab->priv->save_credential) - return; - - result = gnome_keyring_set_network_password_sync ( - NULL, /* default keyring */ - vinagre_connection_get_username (tab->priv->conn), /* user */ - NULL, /* domain */ - vinagre_connection_get_host (tab->priv->conn), /* server */ - NULL, /* object */ - "rfb", /* protocol */ - "vnc-password", /* authtype */ - vinagre_connection_get_port (tab->priv->conn), /* port */ - vinagre_connection_get_password (tab->priv->conn), /* password */ - &tab->priv->keyring_item_id); - - if (result != GNOME_KEYRING_RESULT_OK) - vinagre_utils_show_error (NULL, - _("Error saving the credential on the keyring."), - GTK_WINDOW (tab->priv->window)); - - tab->priv->save_credential = FALSE; -} - -static gboolean -vinagre_tab_find_credentials (VinagreTab *tab, gchar **username, gchar **password) -{ - GnomeKeyringNetworkPasswordData *found_item; - GnomeKeyringResult result; - GList *matches; - - matches = NULL; - *username = NULL; - *password = NULL; - - result = gnome_keyring_find_network_password_sync ( - NULL, /* user */ - NULL, /* domain */ - vinagre_connection_get_host (tab->priv->conn), /* server */ - NULL, /* object */ - "rfb", /* protocol */ - "vnc-password", /* authtype */ - vinagre_connection_get_port (tab->priv->conn), /* port */ - &matches); - - if (result != GNOME_KEYRING_RESULT_OK || matches == NULL || matches->data == NULL) - return FALSE; - - found_item = (GnomeKeyringNetworkPasswordData *) matches->data; - - *username = g_strdup (found_item->user); - *password = g_strdup (found_item->password); - - tab->priv->keyring_item_id = found_item->item_id; - - gnome_keyring_network_password_list_free (matches); - - return TRUE; -} - -static void -vnc_initialized_cb (VncDisplay *vnc, VinagreTab *tab) -{ - GtkLabel *label; - gchar *name; - gboolean scaling, view_only, fullscreen; - - g_object_get (tab->priv->conn, - "view-only", &view_only, - "scaling", &scaling, - "fullscreen", &fullscreen, - NULL); - - vinagre_tab_set_scaling (tab, scaling); - vinagre_tab_set_readonly (tab, view_only); - vnc_display_set_pointer_local (VNC_DISPLAY(tab->priv->vnc), TRUE); - vnc_display_set_keyboard_grab (VNC_DISPLAY(tab->priv->vnc), TRUE); - vnc_display_set_pointer_grab (VNC_DISPLAY(tab->priv->vnc), TRUE); - - if (fullscreen) - vinagre_window_toggle_fullscreen (tab->priv->window); - - vinagre_connection_set_desktop_name (tab->priv->conn, - vnc_display_get_name (VNC_DISPLAY (tab->priv->vnc))); - - name = vinagre_connection_get_best_name (tab->priv->conn); - label = g_object_get_data (G_OBJECT (tab), "label"); - g_return_if_fail (label != NULL); - gtk_label_set_label (label, name); - g_free (name); - - vinagre_window_set_title (tab->priv->window); - vinagre_tab_save_credential (tab); - vinagre_tab_add_recent_used (tab); - - tab->priv->state = VINAGRE_TAB_STATE_CONNECTED; - vinagre_window_update_machine_menu_sensitivity (tab->priv->window); - - /* Emits the signal saying that we have connected to the machine */ - g_signal_emit (G_OBJECT (tab), - signals[TAB_INITIALIZED], - 0); -} - -typedef struct { - GtkWidget *uname, *pw, *button; -} ControlOKButton; - -static void -control_ok_button (GtkEditable *entry, ControlOKButton *data) -{ - gboolean enabled = TRUE; - - if (GTK_WIDGET_VISIBLE (data->uname)) - enabled = enabled && gtk_entry_get_text_length (GTK_ENTRY (data->uname)) > 0; - - if (GTK_WIDGET_VISIBLE (data->pw)) - enabled = enabled && gtk_entry_get_text_length (GTK_ENTRY (data->pw)) > 0; - - gtk_widget_set_sensitive (data->button, enabled); -} - -static gboolean -ask_credential (VinagreTab *tab, - gboolean need_username, - gboolean need_password, - gchar **username, - gchar **password) -{ - GladeXML *xml; - const char *glade_file; - GtkWidget *password_dialog, *host_label, *save_credential_check; - GtkWidget *password_label, *username_label, *image; - gchar *name, *label; - int result; - ControlOKButton control; - - glade_file = vinagre_utils_get_glade_filename (); - xml = glade_xml_new (glade_file, NULL, NULL); - - password_dialog = glade_xml_get_widget (xml, "auth_required_dialog"); - gtk_window_set_transient_for (GTK_WINDOW(password_dialog), GTK_WINDOW(tab->priv->window)); - - host_label = glade_xml_get_widget (xml, "host_label"); - name = vinagre_connection_get_best_name (tab->priv->conn); - label = g_strdup_printf ("%s", name); - gtk_label_set_markup (GTK_LABEL (host_label), label); - g_free (name); - g_free (label); - - control.uname = glade_xml_get_widget (xml, "username_entry"); - control.pw = glade_xml_get_widget (xml, "password_entry"); - control.button = glade_xml_get_widget (xml, "ok_button"); - password_label = glade_xml_get_widget (xml, "password_label"); - username_label = glade_xml_get_widget (xml, "username_label"); - save_credential_check = glade_xml_get_widget (xml, "save_credential_check"); - - image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (control.button), image); - - g_signal_connect (control.uname, "changed", G_CALLBACK (control_ok_button), &control); - g_signal_connect (control.pw, "changed", G_CALLBACK (control_ok_button), &control); - - if (need_username) - { - if (*username) - gtk_entry_set_text (GTK_ENTRY (control.uname), *username); - } - else - { - gtk_widget_hide (username_label); - gtk_widget_hide (control.uname); - } - - if (need_password) - { - if (*password) - gtk_entry_set_text (GTK_ENTRY (control.pw), *password); - } - else - { - gtk_widget_hide (password_label); - gtk_widget_hide (control.pw); - } - - result = gtk_dialog_run (GTK_DIALOG (password_dialog)); - if (result == -5) - { - g_free (*username); - if (gtk_entry_get_text_length (GTK_ENTRY (control.uname)) > 0) - *username = g_strdup (gtk_entry_get_text (GTK_ENTRY (control.uname))); - else - *username = NULL; - - g_free (*password); - if (gtk_entry_get_text_length (GTK_ENTRY (control.pw)) > 0) - *password = g_strdup (gtk_entry_get_text (GTK_ENTRY (control.pw))); - else - *password = NULL; - - tab->priv->save_credential = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (save_credential_check)); - } - - gtk_widget_destroy (GTK_WIDGET (password_dialog)); - g_object_unref (xml); - - return result == -5; -} - -static void -vnc_authentication_cb (VncDisplay *vnc, GValueArray *credList, VinagreTab *tab) -{ - gchar *username, *password; - gboolean need_password, need_username; - int i; - - if (credList == NULL) - return; - - need_password = FALSE; - need_username = FALSE; - username = NULL; - password = NULL; - - for (i = 0; i < credList->n_values; i++) { - switch (g_value_get_enum (&credList->values[i])) - { - case VNC_DISPLAY_CREDENTIAL_USERNAME: - if (vinagre_connection_get_username (tab->priv->conn)) - { - vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_USERNAME, vinagre_connection_get_username (tab->priv->conn)); - break; - } - need_username= TRUE; - break; - - case VNC_DISPLAY_CREDENTIAL_PASSWORD: - if (vinagre_connection_get_password (tab->priv->conn)) - { - vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_PASSWORD, vinagre_connection_get_password (tab->priv->conn)); - break; - } - need_password = TRUE; - break; - - case VNC_DISPLAY_CREDENTIAL_CLIENTNAME: - vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_CLIENTNAME, "vinagre"); - break; - } - } - - if (need_password || need_username) - { - vinagre_tab_find_credentials (tab, &username, &password); - if ( (need_username && !username) || (need_password && !password) ) - { - if (!ask_credential (tab, need_username, need_password, &username, &password)) - { - vinagre_notebook_remove_tab (tab->priv->nb, tab); - goto out; - } - } - - if (need_username) - { - if (username) - { - vinagre_connection_set_username (tab->priv->conn, username); - vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_USERNAME, username); - } - else - { - vinagre_notebook_remove_tab (tab->priv->nb, tab); - vinagre_utils_show_error (_("Authentication error"), - _("A username is required in order to access this machine."), - GTK_WINDOW (tab->priv->window)); - goto out; - } - } - - if (need_password) - { - if (password) - { - vinagre_connection_set_password (tab->priv->conn, password); - vnc_display_set_credential (vnc, VNC_DISPLAY_CREDENTIAL_PASSWORD, password); - } - else - { - vinagre_notebook_remove_tab (tab->priv->nb, tab); - vinagre_utils_show_error (_("Authentication error"), - _("A password is required in order to access this machine."), - GTK_WINDOW (tab->priv->window)); - goto out; - } - } - -out: - g_free (username); - g_free (password); - } -} - -static void -vnc_pointer_grab_cb (VncDisplay *vnc, VinagreTab *tab) -{ - tab->priv->pointer_grab = TRUE; - vinagre_window_set_title (tab->priv->window); -} - -static void -vnc_pointer_ungrab_cb (VncDisplay *vnc, VinagreTab *tab) -{ - tab->priv->pointer_grab = FALSE; - vinagre_window_set_title (tab->priv->window); -} - -static void -vnc_bell_cb (VncDisplay *vnc, VinagreTab *tab) -{ - gdk_window_beep (GTK_WIDGET (tab->priv->window)->window); -} - -static void -vnc_desktop_resize_cb (VncDisplay *vnc, int x, int y, VinagreTab *tab) -{ - g_object_notify (G_OBJECT (tab), "original-width"); - g_object_notify (G_OBJECT (tab), "original-height"); -} - -static void -close_button_clicked (GtkToolButton *button, - VinagreTab *tab) -{ - vinagre_notebook_remove_tab (tab->priv->nb, tab); -} - -static void -minimize_button_clicked (GtkToolButton *button, - VinagreTab *tab) -{ - gtk_window_iconify (GTK_WINDOW (tab->priv->window)); -} - -static void -fullscreen_button_clicked (GtkToolButton *button, - VinagreTab *tab) -{ - vinagre_window_toggle_fullscreen (tab->priv->window); -} - -static void -screenshot_button_clicked (GtkToolButton *button, - VinagreTab *tab) -{ - vinagre_tab_take_screenshot (tab); -} - -static void -cad_button_clicked (GtkToolButton *button, - VinagreTab *tab) -{ - vinagre_tab_send_ctrlaltdel (tab); -} - -static void -ro_button_clicked (GtkToggleToolButton *button, - VinagreTab *tab) -{ - GtkAction *action; - - vinagre_tab_set_readonly (tab, gtk_toggle_tool_button_get_active (button)); - - action = gtk_action_group_get_action (vinagre_window_get_connected_action (tab->priv->window), "ViewReadOnly"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - vinagre_tab_get_readonly (tab)); -} - -static void -scaling_button_clicked (GtkToggleToolButton *button, - VinagreTab *tab) -{ - GtkAction *action; - - if (!vinagre_tab_set_scaling (tab, gtk_toggle_tool_button_get_active (button))) - gtk_toggle_tool_button_set_active (button, FALSE); - - action = gtk_action_group_get_action (vinagre_window_get_connected_action (tab->priv->window), "ViewScaling"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - vinagre_tab_get_scaling (tab)); -} - -static void -setup_layout (VinagreTab *tab) -{ - GtkWidget *button; - - tab->priv->toolbar = gtk_toolbar_new (); - GTK_WIDGET_SET_FLAGS (tab->priv->toolbar, GTK_NO_SHOW_ALL); - - gtk_toolbar_set_style (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOLBAR_BOTH_HORIZ); - - /* Close connection */ - button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE)); - gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Close connection")); - gtk_widget_show (GTK_WIDGET (button)); - gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); - g_signal_connect (button, "clicked", G_CALLBACK (close_button_clicked), tab); - - /* Leave fullscreen */ - button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_LEAVE_FULLSCREEN)); - gtk_widget_show (GTK_WIDGET (button)); - gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); - g_signal_connect (button, "clicked", G_CALLBACK (fullscreen_button_clicked), tab); - - /* Minimize window */ - button = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); - gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Minimize window")); - gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "view-minimize"); - gtk_widget_show (GTK_WIDGET (button)); - gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); - g_signal_connect (button, "clicked", G_CALLBACK (minimize_button_clicked), tab); - - /* Space */ - button = GTK_WIDGET (gtk_separator_tool_item_new ()); - gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (button), FALSE); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (button), TRUE); - gtk_widget_show (GTK_WIDGET (button)); - gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); - - /* Scaling */ - button = GTK_WIDGET (gtk_toggle_tool_button_new ()); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (button), _("Scaling")); - gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Scaling")); - gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "zoom-fit-best"); - gtk_widget_show (GTK_WIDGET (button)); - gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); - g_signal_connect (button, "toggled", G_CALLBACK (scaling_button_clicked), tab); - tab->priv->scaling_button = button; - - /* Read only */ - button = GTK_WIDGET (gtk_toggle_tool_button_new ()); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (button), _("Read only")); - gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Read only")); - gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "emblem-readonly"); - gtk_widget_show (GTK_WIDGET (button)); - gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); - g_signal_connect (button, "toggled", G_CALLBACK (ro_button_clicked), tab); - tab->priv->ro_button = button; - - /* Screenshot */ - button = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); - gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "applets-screenshooter"); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (button), _("Take screenshot")); - gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Take screenshot")); - g_signal_connect (button, "clicked", G_CALLBACK (screenshot_button_clicked), tab); - gtk_widget_show (GTK_WIDGET (button)); - gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); - - /* Send Ctrl-alt-del */ - button = GTK_WIDGET (gtk_tool_button_new (NULL, NULL)); - gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (button), "preferences-desktop-keyboard-shortcuts"); - gtk_tool_button_set_label (GTK_TOOL_BUTTON (button), _("Send Ctrl-Alt-Del")); - gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Send Ctrl-Alt-Del")); - g_signal_connect (button, "clicked", G_CALLBACK (cad_button_clicked), tab); - gtk_widget_show (GTK_WIDGET (button)); - gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); - - tab->priv->layout = ViewAutoDrawer_New (); - ViewAutoDrawer_SetActive (VIEW_AUTODRAWER (tab->priv->layout), FALSE); - ViewOvBox_SetOver (VIEW_OV_BOX (tab->priv->layout), tab->priv->toolbar); - ViewOvBox_SetUnder (VIEW_OV_BOX (tab->priv->layout), tab->priv->scroll); -} - -static void -vinagre_tab_init (VinagreTab *tab) -{ - GtkWidget *viewport; - - tab->priv = VINAGRE_TAB_GET_PRIVATE (tab); - tab->priv->save_credential = FALSE; - tab->priv->keyring_item_id = 0; - tab->priv->state = VINAGRE_TAB_STATE_INITIALIZING; - tab->priv->clipboard_str = NULL; - tab->priv->pointer_grab = FALSE; - - /* Create the scrolled window */ - tab->priv->scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tab->priv->scroll), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (tab->priv->scroll), - GTK_SHADOW_NONE); - - /* Create the vnc widget */ - tab->priv->vnc = vnc_display_new (); - - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (tab->priv->scroll), - tab->priv->vnc); - viewport = gtk_bin_get_child (GTK_BIN (tab->priv->scroll)); - gtk_viewport_set_shadow_type(GTK_VIEWPORT (viewport), GTK_SHADOW_NONE); - - g_signal_connect (tab->priv->vnc, - "vnc-connected", - G_CALLBACK (vnc_connected_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-initialized", - G_CALLBACK (vnc_initialized_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-disconnected", - G_CALLBACK (vnc_disconnected_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-auth-credential", - G_CALLBACK (vnc_authentication_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-pointer-grab", - G_CALLBACK (vnc_pointer_grab_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-pointer-ungrab", - G_CALLBACK (vnc_pointer_ungrab_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-auth-failure", - G_CALLBACK (vnc_auth_failed_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-auth-unsupported", - G_CALLBACK (vnc_auth_unsupported_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-server-cut-text", - G_CALLBACK (vnc_server_cut_text_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-bell", - G_CALLBACK (vnc_bell_cb), - tab); - - g_signal_connect (tab->priv->vnc, - "vnc-desktop-resize", - G_CALLBACK (vnc_desktop_resize_cb), - tab); - - setup_layout (tab); - - gtk_box_pack_end (GTK_BOX(tab), tab->priv->layout, TRUE, TRUE, 0); - gtk_widget_show_all (GTK_WIDGET (tab)); -} - -GtkWidget * -vinagre_tab_new (VinagreConnection *conn, VinagreWindow *window) -{ - VinagreTab *tab = g_object_new (VINAGRE_TYPE_TAB, - "conn", conn, - "window", window, - NULL); - open_vnc (tab); - return GTK_WIDGET (tab); -} - - -gchar * -vinagre_tab_get_tooltips (VinagreTab *tab) -{ - gchar *tip; - - g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); - - tip = g_markup_printf_escaped ( - "%s %s\n\n" - "%s %s\n" - "%s %d\n" - "%s %dx%d", - _("Desktop Name:"), vnc_display_get_name (VNC_DISPLAY (tab->priv->vnc)), - _("Host:"), vinagre_connection_get_host (tab->priv->conn), - _("Port:"), vinagre_connection_get_port (tab->priv->conn), - _("Dimensions:"), vnc_display_get_width (VNC_DISPLAY (tab->priv->vnc)), vnc_display_get_height (VNC_DISPLAY (tab->priv->vnc))); - - return tip; -} - -VinagreConnection * -vinagre_tab_get_conn (VinagreTab *tab) -{ - g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); - - return tab->priv->conn; -} - -GtkWidget * -vinagre_tab_get_vnc (VinagreTab *tab) -{ - g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); - - return tab->priv->vnc; -} - -void -vinagre_tab_set_title (VinagreTab *tab, - const char *title) -{ - GtkLabel *label; - - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - label = GTK_LABEL (g_object_get_data (G_OBJECT (tab), "label")); - gtk_label_set_label (label, title); -} - -void -vinagre_tab_set_notebook (VinagreTab *tab, - VinagreNotebook *nb) -{ - g_return_if_fail (VINAGRE_IS_TAB (tab)); - g_return_if_fail (VINAGRE_IS_NOTEBOOK (nb)); - - tab->priv->nb = nb; -} - -VinagreNotebook * -vinagre_tab_get_notebook (VinagreTab *tab) -{ - g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); - - return tab->priv->nb; -} - -void -vinagre_tab_take_screenshot (VinagreTab *tab) -{ - GdkPixbuf *pix; - GtkWidget *dialog; - GString *suggested_filename; - gchar *filename, *name; - GtkFileFilter *filter; - - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - pix = vnc_display_get_pixbuf (VNC_DISPLAY (tab->priv->vnc)); - if (!pix) - { - vinagre_utils_show_error (NULL, - _("Could not get a screenshot of the connection."), - GTK_WINDOW (tab->priv->window)); - return; - } - - filename = NULL; - name = vinagre_connection_get_best_name (tab->priv->conn); - suggested_filename = g_string_new (NULL); - g_string_printf (suggested_filename, _("Screenshot of %s"), name); - g_string_append (suggested_filename, ".png"); - - dialog = gtk_file_chooser_dialog_new (_("Save Screenshot"), - GTK_WINDOW (tab->priv->window), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested_filename->str); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); - - filter = gtk_file_filter_new (); - gtk_file_filter_set_name (filter, _("Supported formats")); - gtk_file_filter_add_pixbuf_formats (filter); - gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - gdk_pixbuf_save (pix, filename, "png", NULL, NULL); - g_free (filename); - } - - gtk_widget_destroy (dialog); - g_object_unref (pix); - g_string_free (suggested_filename, TRUE); - g_free (name); -} - -void -vinagre_tab_send_ctrlaltdel (VinagreTab *tab) -{ - guint keys[] = { GDK_Control_L, GDK_Alt_L, GDK_Delete }; - - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - vnc_display_send_keys_ex (VNC_DISPLAY (tab->priv->vnc), keys, sizeof (keys) / sizeof (keys[0]), VNC_DISPLAY_KEY_EVENT_CLICK); -} - -void -vinagre_tab_paste_text (VinagreTab *tab, const gchar *text) -{ - gchar *out; - size_t a, b; - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - out = g_convert (text, -1, "iso8859-1", "utf-8", &a, &b, NULL); - - if (out) - { - vnc_display_client_cut_text (VNC_DISPLAY (tab->priv->vnc), out); - g_free (out); - } -} - -gboolean -vinagre_tab_set_scaling (VinagreTab *tab, gboolean active) { - g_return_val_if_fail (VINAGRE_IS_TAB (tab), FALSE); - - if (vnc_display_get_scaling (VNC_DISPLAY (tab->priv->vnc)) == active) - return TRUE; - - vnc_display_set_force_size (VNC_DISPLAY(tab->priv->vnc), !active); - if (!vnc_display_set_scaling (VNC_DISPLAY (tab->priv->vnc), active)) - { - vinagre_utils_show_error (NULL, _("Scaling is not supported on this installation.\n\nRead the README file (shipped with Vinagre) in order to know how to enable this feature."), - GTK_WINDOW (tab->priv->window)); - return FALSE; - } - - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (tab->priv->scaling_button), - active); - - if (active) - gtk_widget_set_size_request (tab->priv->vnc, 0, 0); - else - gtk_widget_set_size_request (tab->priv->vnc, - vnc_display_get_width (VNC_DISPLAY (tab->priv->vnc)), - vnc_display_get_height (VNC_DISPLAY (tab->priv->vnc))); - - return TRUE; -} - -gboolean -vinagre_tab_get_scaling (VinagreTab *tab) { - g_return_val_if_fail (VINAGRE_IS_TAB (tab), FALSE); - - return vnc_display_get_scaling (VNC_DISPLAY (tab->priv->vnc)); -} - -void -vinagre_tab_set_readonly (VinagreTab *tab, gboolean active) { - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - vnc_display_set_read_only (VNC_DISPLAY (tab->priv->vnc), active); - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (tab->priv->ro_button), - active); - -} - -gboolean -vinagre_tab_get_readonly (VinagreTab *tab) { - g_return_val_if_fail (VINAGRE_IS_TAB (tab), FALSE); - - return vnc_display_get_read_only (VNC_DISPLAY (tab->priv->vnc)); -} - -VinagreTabState -vinagre_tab_get_state (VinagreTab *tab) -{ - g_return_val_if_fail (VINAGRE_IS_TAB (tab), VINAGRE_TAB_STATE_INVALID); - - return tab->priv->state; -} - -VinagreTab * -vinagre_tab_get_from_connection (VinagreConnection *conn) -{ - gpointer res; - - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - res = g_object_get_data (G_OBJECT (conn), VINAGRE_TAB_KEY); - - return (res != NULL) ? VINAGRE_TAB (res) : NULL; -} - -gboolean -vinagre_tab_is_pointer_grab (VinagreTab *tab) -{ - g_return_val_if_fail (VINAGRE_IS_TAB (tab), FALSE); - - return tab->priv->pointer_grab; -} - -gint -vinagre_tab_get_original_height (VinagreTab *tab) -{ - g_return_val_if_fail (VINAGRE_IS_TAB (tab), -1); - - if (VNC_IS_DISPLAY (tab->priv->vnc)) - return vnc_display_get_height (VNC_DISPLAY (tab->priv->vnc)); - else - return -1; -} - -gint -vinagre_tab_get_original_width (VinagreTab *tab) -{ - g_return_val_if_fail (VINAGRE_IS_TAB (tab), -1); - - if (VNC_IS_DISPLAY (tab->priv->vnc)) - return vnc_display_get_width (VNC_DISPLAY (tab->priv->vnc)); - else - return -1; -} - - -typedef struct _VinagrePrefSize { - gint width, height; - gulong sig_id; -} VinagrePrefSize; - -static gboolean -cb_unset_size (gpointer data) -{ - GtkWidget *widget = data; - - gtk_widget_queue_resize_no_redraw (widget); - - return FALSE; -} - -static void -cb_set_preferred_size (GtkWidget *widget, GtkRequisition *req, - gpointer data) -{ - VinagrePrefSize *size = data; - - req->width = size->width; - req->height = size->height; - - g_signal_handler_disconnect (widget, size->sig_id); - g_free (size); - g_idle_add (cb_unset_size, widget); -} - -void -vinagre_widget_set_preferred_size (GtkWidget *widget, gint width, - gint height) -{ - VinagrePrefSize *size = g_new (VinagrePrefSize, 1); - - size->width = width; - size->height = height; - size->sig_id = g_signal_connect (widget, "size-request", - G_CALLBACK (cb_set_preferred_size), - size); - - gtk_widget_queue_resize (widget); -} - -void -vinagre_tab_original_size (VinagreTab *tab) -{ - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - gtk_window_unmaximize (GTK_WINDOW (tab->priv->window)); - gtk_window_resize (GTK_WINDOW (tab->priv->window), 1, 1); - vinagre_widget_set_preferred_size (GTK_WIDGET (tab), - vinagre_tab_get_original_width (tab), - vinagre_tab_get_original_height (tab)); -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-tab.h vinagre-2.29.1/src/vinagre-tab.h --- vinagre-2.26.1/src/vinagre-tab.h 2008-10-17 21:47:03.000000000 +0100 +++ vinagre-2.29.1/src/vinagre-tab.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,108 +0,0 @@ -/* - * vinagre-tab.h - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_TAB_H__ -#define __VINAGRE_TAB_H__ - -#include - -G_BEGIN_DECLS - -#define VINAGRE_TYPE_TAB (vinagre_tab_get_type()) -#define VINAGRE_TAB(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_TAB, VinagreTab)) -#define VINAGRE_TAB_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_TAB, VinagreTab const)) -#define VINAGRE_TAB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_TAB, VinagreTabClass)) -#define VINAGRE_IS_TAB(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_TAB)) -#define VINAGRE_IS_TAB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_TAB)) -#define VINAGRE_TAB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_TAB, VinagreTabClass)) -#define VINAGRE_TAB_KEY "VINAGRE_TAB_KEY" - -typedef struct _VinagreTabPrivate VinagreTabPrivate; -typedef struct _VinagreTab VinagreTab; -typedef struct _VinagreTabClass VinagreTabClass; - -#include "vinagre-connection.h" -#include "vinagre-notebook.h" -#include "vinagre-window.h" - -typedef enum -{ - VINAGRE_TAB_STATE_INITIALIZING = 1, - VINAGRE_TAB_STATE_CONNECTED, - VINAGRE_TAB_STATE_INVALID -} VinagreTabState; - - -struct _VinagreTab -{ - GtkVBox vbox; - VinagreTabPrivate *priv; -}; - -struct _VinagreTabClass -{ - GtkVBoxClass parent_class; - - /* Signals */ - void (* tab_connected) (VinagreTab *tab); - void (* tab_disconnected) (VinagreTab *tab); - void (* tab_initialized) (VinagreTab *tab); -}; - -GType vinagre_tab_get_type (void) G_GNUC_CONST; - -GtkWidget *vinagre_tab_new (VinagreConnection *conn, - VinagreWindow *window); - -VinagreConnection *vinagre_tab_get_conn (VinagreTab *tab); - -GtkWidget *vinagre_tab_get_vnc (VinagreTab *tab); - -gchar *vinagre_tab_get_tooltips (VinagreTab *tab); - -void vinagre_tab_set_title (VinagreTab *tab, - const char *title); - -void vinagre_tab_set_notebook (VinagreTab *tab, - VinagreNotebook *nb); -VinagreNotebook *vinagre_tab_get_notebook (VinagreTab *tab); - -void vinagre_tab_take_screenshot (VinagreTab *tab); -void vinagre_tab_send_ctrlaltdel (VinagreTab *tab); -void vinagre_tab_paste_text (VinagreTab *tab, - const gchar *text); - -gboolean vinagre_tab_set_scaling (VinagreTab *tab, gboolean active); -gboolean vinagre_tab_get_scaling (VinagreTab *tab); -void vinagre_tab_set_readonly (VinagreTab *tab, gboolean active); -gboolean vinagre_tab_get_readonly (VinagreTab *tab); - -gint vinagre_tab_get_original_width (VinagreTab *tab); -gint vinagre_tab_get_original_height (VinagreTab *tab); -void vinagre_tab_original_size (VinagreTab *tab); - -VinagreTabState vinagre_tab_get_state (VinagreTab *tab); -VinagreTab *vinagre_tab_get_from_connection (VinagreConnection *conn); - -gboolean vinagre_tab_is_pointer_grab (VinagreTab *tab); -G_END_DECLS - -#endif /* __VINAGRE_TAB_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-ui.h vinagre-2.29.1/src/vinagre-ui.h --- vinagre-2.26.1/src/vinagre-ui.h 2008-12-11 16:40:11.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-ui.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,128 +0,0 @@ -/* - * vinagre-ui.h - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_UI_H__ -#define __VINAGRE_UI_H__ - -#include - -#include "vinagre-commands.h" - -G_BEGIN_DECLS - -static const GtkActionEntry vinagre_always_sensitive_menu_entries[] = -{ - /* Toplevel */ - { "Machine", NULL, N_("_Machine") }, - { "Edit", NULL, N_("_Edit") }, - { "View", NULL, N_("_View") }, - { "Bookmarks", NULL, N_("_Bookmarks") }, - { "Help", NULL, N_("_Help") }, - - /* Machine menu */ - { "MachineConnect", GTK_STOCK_CONNECT, NULL, "N", - N_("Connect to a remote machine"), G_CALLBACK (vinagre_cmd_machine_connect) }, - { "MachineOpen", GTK_STOCK_OPEN, NULL, "O", - N_("Open a .VNC file"), G_CALLBACK (vinagre_cmd_machine_open) }, - { "MachineQuit", GTK_STOCK_QUIT, NULL, "Q", - N_("Quit the program"), G_CALLBACK (vinagre_cmd_machine_quit) }, - - /* Edit menu */ - { "EditPreferences", GTK_STOCK_PREFERENCES, NULL, NULL, - N_("Edit the application preferences"), G_CALLBACK (vinagre_cmd_edit_preferences) }, - - /* Bookmarks menu */ - { "BookmarksOpen", GTK_STOCK_CONNECT, N_("_Open bookmark"), NULL, - N_("Connect to this machine"), G_CALLBACK (vinagre_cmd_bookmarks_open) }, - { "BookmarksEdit", GTK_STOCK_EDIT, N_("_Edit bookmark"), NULL, - N_("Edit the details of selected bookmark"), G_CALLBACK (vinagre_cmd_bookmarks_edit) }, - { "BookmarksDel", GTK_STOCK_DELETE, N_("_Remove from bookmarks"), NULL, - N_("Remove current selected connection from bookmarks"), G_CALLBACK (vinagre_cmd_bookmarks_del) }, - { "BookmarksNewFolder", "folder-new", N_("_New Folder"), NULL, - N_("Create a new folder"), G_CALLBACK (vinagre_cmd_bookmarks_new_folder) }, - - /* Help menu */ - {"HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", - N_("Open the vinagre manual"), G_CALLBACK (vinagre_cmd_help_contents)}, - { "HelpAbout", GTK_STOCK_ABOUT, NULL, NULL, - N_("About this application"), G_CALLBACK (vinagre_cmd_help_about) } -}; - -static const GtkActionEntry vinagre_menu_entries[] = -{ - /* Machine menu */ - { "MachineClose", GTK_STOCK_CLOSE, NULL, "W", - N_("Close the current connection"), G_CALLBACK (vinagre_cmd_machine_close) }, - { "MachineCloseAll", GTK_STOCK_CLOSE, N_("C_lose All"), "W", - N_("Close all active connections"), G_CALLBACK (vinagre_cmd_machine_close_all) }, - - /* Bookmarks menu */ - { "BookmarksAdd", GTK_STOCK_SAVE, N_("_Add to bookmarks"), "D", - N_("Add current connection to your bookmarks"), G_CALLBACK (vinagre_cmd_bookmarks_add) } - -}; - -static const GtkActionEntry vinagre_machine_connected_menu_entries[] = -{ - /* Machine menu */ - { "MachineTakeScreenshot", "applets-screenshooter", N_("Take screenshot"), NULL, - N_("Take a screenshot of active connection"), G_CALLBACK (vinagre_cmd_machine_take_screenshot) }, - - { "MachineSendCtrlAltDel", "preferences-desktop-keyboard-shortcuts", N_("Send Ctrl-Alt-Del"), NULL, - N_("Send Ctrl+Alt+Del to active connection"), G_CALLBACK (vinagre_cmd_machine_send_ctrlaltdel) }, - - /* View menu */ - { "ViewFullScreen", GTK_STOCK_FULLSCREEN, NULL, "F11", - N_("View the current machine in full screen"), G_CALLBACK (vinagre_cmd_view_fullscreen) }, - - { "ViewOriginalSize", "zoom-original", N_("_Original size"), NULL, - N_("Adjusts the window to the remote desktop's size"), G_CALLBACK (vinagre_cmd_view_original_size) }, - -}; - -static const GtkToggleActionEntry vinagre_machine_connected_toggle_menu_entries[] = -{ - { "ViewScaling", NULL, N_("S_caling"), NULL, - N_("Fit the remote screen into the current window size"), - G_CALLBACK (vinagre_cmd_view_scaling), FALSE }, - { "ViewReadOnly", NULL, N_("_Read only"), NULL, - N_("Disable mouse and keyboard"), - G_CALLBACK (vinagre_cmd_view_readonly), FALSE } -}; - -static const GtkToggleActionEntry vinagre_always_sensitive_toggle_menu_entries[] = -{ - { "ViewToolbar", NULL, N_("_Toolbar"), NULL, - N_("Show or hide the toolbar"), - G_CALLBACK (vinagre_cmd_view_show_toolbar), FALSE }, - - { "ViewStatusbar", NULL, N_("_Statusbar"), NULL, - N_("Show or hide the statusbar"), - G_CALLBACK (vinagre_cmd_view_show_statusbar), FALSE }, - - { "ViewSidePanel", NULL, N_("Side _Panel"), "F9", - N_("Show or hide the side panel"), - G_CALLBACK (vinagre_cmd_view_show_fav_panel), FALSE } -}; - -G_END_DECLS - -#endif /* __VINAGRE_UI_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-utils.c vinagre-2.29.1/src/vinagre-utils.c --- vinagre-2.26.1/src/vinagre-utils.c 2008-12-15 11:46:50.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-utils.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,474 +0,0 @@ -/* - * vinagre-utils.c - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "vinagre-utils.h" - -#define VINAGRE_GLADE_FILE "vinagre.glade" -#define VINAGRE_UI_XML_FILE "vinagre-ui.xml" - -#ifdef HAVE_CONFIG_H -#include -#endif - -/* For the workspace/viewport stuff */ -#ifdef GDK_WINDOWING_X11 -#include -#include -#include -#include -#endif - -GtkWidget * -vinagre_utils_create_small_close_button () -{ - GtkRcStyle *rcstyle; - GtkWidget *image; - GtkWidget *close_button; - - close_button = gtk_button_new (); - gtk_button_set_relief (GTK_BUTTON (close_button), - GTK_RELIEF_NONE); - /* don't allow focus on the close button */ - gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); - - /* make it as small as possible */ - rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style (close_button, rcstyle); - g_object_unref (rcstyle), - - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, - GTK_ICON_SIZE_MENU); - gtk_container_add (GTK_CONTAINER (close_button), image); - - return close_button; -} - -void -vinagre_utils_show_error (const gchar *title, const gchar *message, GtkWindow *parent) -{ - GtkWidget *d; - gchar *t; - - if (title) - t = g_strdup (title); - else - t = g_strdup (_("An error has occurred:")); - - d = gtk_message_dialog_new (parent, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", - t); - g_free (t); - - if (message) - gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (d), - "%s", - message); - - g_signal_connect_swapped (d, - "response", - G_CALLBACK (gtk_widget_destroy), - d); - gtk_widget_show_all (GTK_WIDGET(d)); -} - -void -vinagre_utils_show_many_errors (const gchar *title, GSList *items, GtkWindow *parent) -{ - GString *msg; - GSList *l; - - msg = g_string_new (NULL); - - for (l = items; l; l = l->next) - g_string_append_printf (msg, "%s\n", (gchar *)l->data); - - vinagre_utils_show_error (title, msg->str, parent); - g_string_free (msg, TRUE); -} - -void -vinagre_utils_toggle_widget_visible (GtkWidget *widget) -{ - if (GTK_WIDGET_VISIBLE (widget)) - gtk_widget_hide (widget); - else - gtk_widget_show_all (widget); -} - -const gchar * -vinagre_utils_get_glade_filename (void) -{ - if (g_file_test (VINAGRE_GLADE_FILE, G_FILE_TEST_EXISTS)) - return VINAGRE_GLADE_FILE; - else - return VINAGRE_DATADIR "/" VINAGRE_GLADE_FILE; -} - -const gchar * -vinagre_utils_get_ui_xml_filename (void) -{ - if (g_file_test (VINAGRE_UI_XML_FILE, G_FILE_TEST_EXISTS)) - return VINAGRE_UI_XML_FILE; - else - return VINAGRE_DATADIR "/" VINAGRE_UI_XML_FILE; -} - -/* - * Doubles underscore to avoid spurious menu accels. - */ -gchar * -vinagre_utils_escape_underscores (const gchar* text, - gssize length) -{ - GString *str; - const gchar *p; - const gchar *end; - - g_return_val_if_fail (text != NULL, NULL); - - if (length < 0) - length = strlen (text); - - str = g_string_sized_new (length); - - p = text; - end = text + length; - - while (p != end) - { - const gchar *next; - next = g_utf8_next_char (p); - - switch (*p) - { - case '_': - g_string_append (str, "__"); - break; - default: - g_string_append_len (str, p, next - p); - break; - } - - p = next; - } - - return g_string_free (str, FALSE); -} - -static void _default_log (const gchar *log_domain G_GNUC_UNUSED, - GLogLevelFlags log_level G_GNUC_UNUSED, - const gchar *message, - gpointer user_data G_GNUC_UNUSED) -{ - printf ("gtk-vnc: %s", message); -} - -void -vinagre_utils_handle_debug (void) -{ - static gboolean initialized = FALSE; - - if (initialized) - return; - - g_log_set_handler ("gtk-vnc", - G_LOG_LEVEL_DEBUG, - _default_log, - NULL); - - initialized = TRUE; -} - -/* the following two functions are courtesy of galeon */ - -/** - * gedit_utils_get_current_workspace: Get the current workspace - * - * Get the currently visible workspace for the #GdkScreen. - * - * If the X11 window property isn't found, 0 (the first workspace) - * is returned. - */ -guint -vinagre_utils_get_current_workspace (GdkScreen *screen) -{ -#ifdef GDK_WINDOWING_X11 - GdkWindow *root_win; - GdkDisplay *display; - Atom type; - gint format; - gulong nitems; - gulong bytes_after; - guint *current_desktop; - gint err, result; - guint ret = 0; - - g_return_val_if_fail (GDK_IS_SCREEN (screen), 0); - - root_win = gdk_screen_get_root_window (screen); - display = gdk_screen_get_display (screen); - - gdk_error_trap_push (); - result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win), - gdk_x11_get_xatom_by_name_for_display (display, "_NET_CURRENT_DESKTOP"), - 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, - &bytes_after, (gpointer) ¤t_desktop); - err = gdk_error_trap_pop (); - - if (err != Success || result != Success) - return ret; - - if (type == XA_CARDINAL && format == 32 && nitems > 0) - ret = current_desktop[0]; - - XFree (current_desktop); - return ret; -#else - /* FIXME: on mac etc proably there are native APIs - * to get the current workspace etc */ - return 0; -#endif -} - -/** - * gedit_utils_get_window_workspace: Get the workspace the window is on - * - * This function gets the workspace that the #GtkWindow is visible on, - * it returns GEDIT_ALL_WORKSPACES if the window is sticky, or if - * the window manager doesn support this function - */ -guint -vinagre_utils_get_window_workspace (GtkWindow *gtkwindow) -{ -#ifdef GDK_WINDOWING_X11 - GdkWindow *window; - GdkDisplay *display; - Atom type; - gint format; - gulong nitems; - gulong bytes_after; - guint *workspace; - gint err, result; - guint ret = VINAGRE_ALL_WORKSPACES; - - g_return_val_if_fail (GTK_IS_WINDOW (gtkwindow), 0); - g_return_val_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (gtkwindow)), 0); - - window = GTK_WIDGET (gtkwindow)->window; - display = gdk_drawable_get_display (window); - - gdk_error_trap_push (); - result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window), - gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP"), - 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, - &bytes_after, (gpointer) &workspace); - err = gdk_error_trap_pop (); - - if (err != Success || result != Success) - return ret; - - if (type == XA_CARDINAL && format == 32 && nitems > 0) - ret = workspace[0]; - - XFree (workspace); - return ret; -#else - /* FIXME: on mac etc proably there are native APIs - * to get the current workspace etc */ - return 0; -#endif -} - -/** - * gedit_utils_get_current_viewport: Get the current viewport origin - * - * Get the currently visible viewport origin for the #GdkScreen. - * - * If the X11 window property isn't found, (0, 0) is returned. - */ -void -vinagre_utils_get_current_viewport (GdkScreen *screen, - gint *x, - gint *y) -{ -#ifdef GDK_WINDOWING_X11 - GdkWindow *root_win; - GdkDisplay *display; - Atom type; - gint format; - gulong nitems; - gulong bytes_after; - gulong *coordinates; - gint err, result; - - g_return_if_fail (GDK_IS_SCREEN (screen)); - g_return_if_fail (x != NULL && y != NULL); - - /* Default values for the viewport origin */ - *x = 0; - *y = 0; - - root_win = gdk_screen_get_root_window (screen); - display = gdk_screen_get_display (screen); - - gdk_error_trap_push (); - result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win), - gdk_x11_get_xatom_by_name_for_display (display, "_NET_DESKTOP_VIEWPORT"), - 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, - &bytes_after, (void*) &coordinates); - err = gdk_error_trap_pop (); - - if (err != Success || result != Success) - return; - - if (type != XA_CARDINAL || format != 32 || nitems < 2) - { - XFree (coordinates); - return; - } - - *x = coordinates[0]; - *y = coordinates[1]; - XFree (coordinates); -#else - /* FIXME: on mac etc proably there are native APIs - * to get the current workspace etc */ - *x = 0; - *y = 0; -#endif -} - -/* Make url in about dialog clickable */ -static void -vinagre_about_dialog_handle_url (GtkAboutDialog *about, - const char *link, - gpointer data) -{ - GError *error = NULL; - gchar *address; - GdkScreen *screen; - - if (g_strstr_len (link, strlen (link), "@")) - address = g_strdup_printf ("mailto:%s", link); - else - address = g_strdup (link); - - screen = GTK_IS_WINDOW (data) ? gtk_window_get_screen (GTK_WINDOW (data)) : NULL; - - gtk_show_uri (screen, - address, - GDK_CURRENT_TIME, - &error); - - if (error != NULL) - { - vinagre_utils_show_error (NULL, error->message, GTK_IS_WINDOW (data) ? GTK_WINDOW (data) : NULL); - g_error_free (error); - } - - g_free (address); -} - -void -vinagre_utils_help_contents (GtkWindow *window) -{ - GError *error; - GdkScreen *screen; - - screen = GTK_IS_WINDOW (window) ? gtk_window_get_screen (GTK_WINDOW (window)) : NULL; - error = NULL; - - gtk_show_uri (screen, - "ghelp:vinagre", - GDK_CURRENT_TIME, - &error); - - if (error != NULL) - { - vinagre_utils_show_error (NULL, error->message, GTK_IS_WINDOW (window) ? window : NULL); - g_error_free (error); - } -} - -void -vinagre_utils_help_about (GtkWindow *window) -{ - static const gchar * const authors[] = { - "Jonh Wendell ", - NULL - }; - - static const gchar * const artists[] = { - "Vinicius Depizzol ", - NULL - }; - - static const gchar copyright[] = \ - "Copyright \xc2\xa9 2007 Jonh Wendell"; - - static const gchar comments[] = \ - N_("Vinagre is a VNC client for the GNOME Desktop"); - - static const char *license[] = { - N_("Vinagre 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."), - N_("Vinagre 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."), - N_("You should have received a copy of the GNU General Public License " - "along with this program. If not, see .") - }; - - gchar *license_trans; - - license_trans = g_strjoin ("\n\n", _(license[0]), _(license[1]), - _(license[2]), NULL); - - /* Make URLs and email clickable in about dialog */ - gtk_about_dialog_set_url_hook (vinagre_about_dialog_handle_url, window, NULL); - gtk_about_dialog_set_email_hook (vinagre_about_dialog_handle_url, window, NULL); - - - gtk_show_about_dialog (GTK_IS_WINDOW (window)?window:NULL, - "authors", authors, - "artists", artists, - "comments", _(comments), - "copyright", copyright, - "license", license_trans, - "wrap-license", TRUE, - "logo-icon-name", "vinagre", - "translator-credits", _("translator-credits"), - "version", VERSION, - "website", "http://projects.gnome.org/vinagre/", - "website-label", _("Vinagre Website"), - NULL); - g_free (license_trans); -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-utils.h vinagre-2.29.1/src/vinagre-utils.h --- vinagre-2.26.1/src/vinagre-utils.h 2008-11-16 11:30:24.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-utils.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -/* - * vinagre-utils.h - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_UTILS_H__ -#define __VINAGRE_UTILS_H__ - -#include -#include - -/* useful macro */ -#define GBOOLEAN_TO_POINTER(i) ((gpointer) ((i) ? 2 : 1)) -#define GPOINTER_TO_BOOLEAN(i) ((gboolean) ((((gint)(i)) == 2) ? TRUE : FALSE)) -#define IS_VALID_BOOLEAN(v) (((v == TRUE) || (v == FALSE)) ? TRUE : FALSE) - -enum { - TARGET_VINAGRE, - TARGET_STRING -}; - -static GtkTargetEntry vinagre_target_list[] = { - { "VINAGRE", 0, TARGET_VINAGRE }, - { "text/plain", 0, TARGET_STRING } -}; -static guint vinagre_n_targets = G_N_ELEMENTS (vinagre_target_list); - -enum { VINAGRE_ALL_WORKSPACES = 0xffffffff }; - -GtkWidget *vinagre_utils_create_small_close_button (void); - -void vinagre_utils_show_error (const gchar *title, - const gchar *message, - GtkWindow *parent); - -void vinagre_utils_show_many_errors (const gchar *title, - GSList *items, - GtkWindow *parent); - -void vinagre_utils_toggle_widget_visible (GtkWidget *widget); - -const gchar *vinagre_utils_get_glade_filename (void); -const gchar *vinagre_utils_get_ui_xml_filename (void); - -gchar *vinagre_utils_escape_underscores (const gchar *text, - gssize length); - -void vinagre_utils_handle_debug (void); - -guint vinagre_utils_get_current_workspace (GdkScreen *screen); -guint vinagre_utils_get_window_workspace (GtkWindow *gtkwindow); -void vinagre_utils_get_current_viewport (GdkScreen *screen, - gint *x, - gint *y); - -void vinagre_utils_help_contents (GtkWindow *window); -void vinagre_utils_help_about (GtkWindow *window); -#endif /* __VINAGRE_UTILS_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-window.c vinagre-2.29.1/src/vinagre-window.c --- vinagre-2.26.1/src/vinagre-window.c 2009-03-06 17:23:04.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-window.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1223 +0,0 @@ -/* - * vinagre-window.c - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include - -#include -#include - -#include "vinagre-window.h" -#include "vinagre-notebook.h" -#include "vinagre-fav.h" -#include "vinagre-prefs.h" -#include "vinagre-utils.h" -#include "vinagre-bookmarks.h" -#include "vinagre-ui.h" -#include "vinagre-window-private.h" -#include "vinagre-bookmarks-entry.h" - -#ifdef VINAGRE_ENABLE_AVAHI -#include "vinagre-mdns.h" -#endif - -#define VINAGRE_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\ - VINAGRE_TYPE_WINDOW, \ - VinagreWindowPrivate)) - -G_DEFINE_TYPE(VinagreWindow, vinagre_window, GTK_TYPE_WINDOW) - -static void -vinagre_window_dispose (GObject *object) -{ - VinagreWindow *window = VINAGRE_WINDOW (object); - - if (window->priv->fav_entry_selected) - { - g_object_unref (window->priv->fav_entry_selected); - window->priv->fav_entry_selected = NULL; - } - - if (window->priv->manager) - { - g_object_unref (window->priv->manager); - window->priv->manager = NULL; - } - - if (window->priv->signal_notebook != 0) - { - g_signal_handler_disconnect (window->priv->notebook, - window->priv->signal_notebook); - window->priv->signal_notebook = 0; - } - - if (window->priv->signal_clipboard != 0) - { - GtkClipboard *cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);; - - g_signal_handler_disconnect (cb, - window->priv->signal_clipboard); - window->priv->signal_clipboard = 0; - } - - if (window->priv->update_recents_menu_ui_id != 0) - { - GtkRecentManager *recent_manager = gtk_recent_manager_get_default (); - - g_signal_handler_disconnect (recent_manager, - window->priv->update_recents_menu_ui_id); - window->priv->update_recents_menu_ui_id = 0; - } - - G_OBJECT_CLASS (vinagre_window_parent_class)->dispose (object); -} - -static gboolean -vinagre_window_delete_event (GtkWidget *widget, - GdkEventAny *event) -{ - VinagreWindow *window = VINAGRE_WINDOW (widget); - - vinagre_window_close_all_tabs (window); - - if (GTK_WIDGET_CLASS (vinagre_window_parent_class)->delete_event) - return GTK_WIDGET_CLASS (vinagre_window_parent_class)->delete_event (widget, event); - else - return FALSE; -} - -static void -vinagre_window_show_hide_controls (VinagreWindow *window) -{ - if (window->priv->fullscreen) - { - window->priv->fav_panel_visible = GTK_WIDGET_VISIBLE (window->priv->fav_panel); - gtk_widget_hide (window->priv->fav_panel); - - window->priv->toolbar_visible = GTK_WIDGET_VISIBLE (window->priv->toolbar); - gtk_widget_hide (window->priv->toolbar); - - gtk_widget_hide (window->priv->menubar); - - window->priv->statusbar_visible = GTK_WIDGET_VISIBLE (window->priv->statusbar); - gtk_widget_hide (window->priv->statusbar); - - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->priv->notebook), FALSE); - gtk_notebook_set_show_border (GTK_NOTEBOOK (window->priv->notebook), FALSE); - } - else - { - if (window->priv->fav_panel_visible) - gtk_widget_show_all (window->priv->fav_panel); - - if (window->priv->toolbar_visible) - gtk_widget_show_all (window->priv->toolbar); - - gtk_widget_show_all (window->priv->menubar); - - if (window->priv->statusbar_visible) - gtk_widget_show_all (window->priv->statusbar); - - vinagre_notebook_show_hide_tabs (VINAGRE_NOTEBOOK (window->priv->notebook)); - gtk_notebook_set_show_border (GTK_NOTEBOOK (window->priv->notebook), TRUE); - } -} - -static gboolean -vinagre_window_state_event_cb (GtkWidget *widget, - GdkEventWindowState *event) -{ - VinagreWindow *window = VINAGRE_WINDOW (widget); - - window->priv->window_state = event->new_window_state; - g_object_set (vinagre_prefs_get_default (), - "window-state", window->priv->window_state, - NULL); - - if ((event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) == 0) - return FALSE; - - if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) - window->priv->fullscreen = TRUE; - else - window->priv->fullscreen = FALSE; - - vinagre_window_show_hide_controls (window); - - if (GTK_WIDGET_CLASS (vinagre_window_parent_class)->window_state_event) - return GTK_WIDGET_CLASS (vinagre_window_parent_class)->window_state_event (widget, event); - else - return FALSE; -} - -static gboolean -vinagre_window_configure_event (GtkWidget *widget, - GdkEventConfigure *event) -{ - VinagreWindow *window = VINAGRE_WINDOW (widget); - - window->priv->width = event->width; - window->priv->height = event->height; - - g_object_set (vinagre_prefs_get_default (), - "window-width", window->priv->width, - "window-height", window->priv->height, - NULL); - - return GTK_WIDGET_CLASS (vinagre_window_parent_class)->configure_event (widget, event); -} - -static void -vinagre_window_class_init (VinagreWindowClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - object_class->dispose = vinagre_window_dispose; - - widget_class->window_state_event = vinagre_window_state_event_cb; - widget_class->configure_event = vinagre_window_configure_event; - widget_class->delete_event = vinagre_window_delete_event; - - g_type_class_add_private (object_class, sizeof(VinagreWindowPrivate)); -} - -static void -menu_item_select_cb (GtkItem *proxy, - VinagreWindow *window) -{ - GtkAction *action; - char *message; - - action = g_object_get_data (G_OBJECT (proxy), "gtk-action"); - g_return_if_fail (action != NULL); - - g_object_get (G_OBJECT (action), "tooltip", &message, NULL); - if (message) - { - gtk_statusbar_push (GTK_STATUSBAR (window->priv->statusbar), - window->priv->tip_message_cid, message); - g_free (message); - } -} - -static void -menu_item_deselect_cb (GtkItem *proxy, - VinagreWindow *window) -{ - gtk_statusbar_pop (GTK_STATUSBAR (window->priv->statusbar), - window->priv->tip_message_cid); -} - -static void -connect_proxy_cb (GtkUIManager *manager, - GtkAction *action, - GtkWidget *proxy, - VinagreWindow *window) -{ - if (GTK_IS_MENU_ITEM (proxy)) - { - g_signal_connect (proxy, "select", - G_CALLBACK (menu_item_select_cb), window); - g_signal_connect (proxy, "deselect", - G_CALLBACK (menu_item_deselect_cb), window); - } -} - -static void -disconnect_proxy_cb (GtkUIManager *manager, - GtkAction *action, - GtkWidget *proxy, - VinagreWindow *window) -{ - if (GTK_IS_MENU_ITEM (proxy)) - { - g_signal_handlers_disconnect_by_func - (proxy, G_CALLBACK (menu_item_select_cb), window); - g_signal_handlers_disconnect_by_func - (proxy, G_CALLBACK (menu_item_deselect_cb), window); - } -} - -static void -activate_recent_cb (GtkRecentChooser *action, VinagreWindow *window) -{ - VinagreConnection *conn; - gchar *error; - - conn = vinagre_connection_new_from_string (gtk_recent_chooser_get_current_uri (action), - &error, - TRUE); - if (conn) - { - vinagre_cmd_open_bookmark (window, conn); - g_object_unref (conn); - } - else - vinagre_utils_show_error (NULL, error ? error : _("Unknown error"), GTK_WINDOW (window)); - - g_free (error); -} - -static void -update_recent_connections (VinagreWindow *window) -{ - VinagreWindowPrivate *p = window->priv; - - g_return_if_fail (p->recent_action_group != NULL); - - if (p->recents_menu_ui_id != 0) - gtk_ui_manager_remove_ui (p->manager, p->recents_menu_ui_id); - - p->recents_menu_ui_id = gtk_ui_manager_new_merge_id (p->manager); - - gtk_ui_manager_add_ui (p->manager, - p->recents_menu_ui_id, - "/MenuBar/MachineMenu/FileRecentsPlaceholder", - "recent_connections", - "recent_connections", - GTK_UI_MANAGER_MENUITEM, - FALSE); -} - -static void -recent_manager_changed (GtkRecentManager *manager, - VinagreWindow *window) -{ - update_recent_connections (window); -} - -static void -show_hide_accels (VinagreWindow *window) -{ - gboolean show_accels; - - g_object_get (vinagre_prefs_get_default (), - "show-accels", &show_accels, - NULL); - g_object_set (gtk_settings_get_default (), - "gtk-enable-accels", show_accels, - "gtk-enable-mnemonics", show_accels, - NULL); -} - -static void -create_menu_bar_and_toolbar (VinagreWindow *window, - GtkWidget *main_box) -{ - GtkActionGroup *action_group; - GtkUIManager *manager; - GError *error = NULL; - GtkRecentManager *recent_manager; - GtkRecentFilter *filter; - GtkAction *action; - - manager = gtk_ui_manager_new (); - window->priv->manager = manager; - - /* show tooltips in the statusbar */ - g_signal_connect (manager, - "connect-proxy", - G_CALLBACK (connect_proxy_cb), - window); - g_signal_connect (manager, - "disconnect-proxy", - G_CALLBACK (disconnect_proxy_cb), - window); - - gtk_window_add_accel_group (GTK_WINDOW (window), - gtk_ui_manager_get_accel_group (manager)); - - action_group = gtk_action_group_new ("VinagreWindowAlwaysSensitiveActions"); - gtk_action_group_set_translation_domain (action_group, NULL); - gtk_action_group_add_actions (action_group, - vinagre_always_sensitive_menu_entries, - G_N_ELEMENTS (vinagre_always_sensitive_menu_entries), - window); - - gtk_action_group_add_toggle_actions (action_group, - vinagre_always_sensitive_toggle_menu_entries, - G_N_ELEMENTS (vinagre_always_sensitive_toggle_menu_entries), - window); - - gtk_ui_manager_insert_action_group (manager, action_group, 0); - g_object_unref (action_group); - window->priv->always_sensitive_action_group = action_group; - - action = gtk_action_group_get_action (action_group, "MachineConnect"); - g_object_set (action, "is_important", TRUE, NULL); - - action_group = gtk_action_group_new ("VinagreWindowActions"); - gtk_action_group_set_translation_domain (action_group, NULL); - gtk_action_group_add_actions (action_group, - vinagre_menu_entries, - G_N_ELEMENTS (vinagre_menu_entries), - window); - - gtk_ui_manager_insert_action_group (manager, action_group, 0); - g_object_unref (action_group); - window->priv->action_group = action_group; - - action = gtk_action_group_get_action (action_group, "MachineClose"); - g_object_set (action, "is_important", TRUE, NULL); - - /* Machine connected actions */ - action_group = gtk_action_group_new ("VinagreWindowMachineConnectedActions"); - gtk_action_group_set_translation_domain (action_group, NULL); - gtk_action_group_add_actions (action_group, - vinagre_machine_connected_menu_entries, - G_N_ELEMENTS (vinagre_machine_connected_menu_entries), - window); - gtk_action_group_add_toggle_actions (action_group, - vinagre_machine_connected_toggle_menu_entries, - G_N_ELEMENTS (vinagre_machine_connected_toggle_menu_entries), - window); - - gtk_ui_manager_insert_action_group (manager, action_group, 0); - g_object_unref (action_group); - window->priv->machine_connected_action_group = action_group; - - action = gtk_action_group_get_action (action_group, "ViewFullScreen"); - g_object_set (action, "is_important", TRUE, NULL); - action = gtk_action_group_get_action (action_group, "MachineTakeScreenshot"); - g_object_set (action, "is_important", TRUE, NULL); - action = gtk_action_group_get_action (action_group, "MachineSendCtrlAltDel"); - g_object_set (action, "is_important", TRUE, NULL); - - /* now load the UI definition */ - gtk_ui_manager_add_ui_from_file (manager, vinagre_utils_get_ui_xml_filename (), &error); - if (error != NULL) - { - g_warning (_("Could not merge vinagre-ui.xml: %s"), error->message); - g_error_free (error); - } - - /* Bookmarks */ - action_group = gtk_action_group_new ("BookmarksActions"); - gtk_action_group_set_translation_domain (action_group, NULL); - window->priv->bookmarks_list_action_group = action_group; - gtk_ui_manager_insert_action_group (manager, action_group, 0); - g_object_unref (action_group); - - window->priv->menubar = gtk_ui_manager_get_widget (manager, "/MenuBar"); - gtk_box_pack_start (GTK_BOX (main_box), - window->priv->menubar, - FALSE, - FALSE, - 0); - - window->priv->toolbar = gtk_ui_manager_get_widget (manager, "/ToolBar"); - gtk_widget_hide (window->priv->toolbar); - gtk_box_pack_start (GTK_BOX (main_box), - window->priv->toolbar, - FALSE, - FALSE, - 0); - - /* Recent connections */ - window->priv->recent_action = gtk_recent_action_new ("recent_connections", - _("_Recent connections"), - NULL, NULL); - g_object_set (G_OBJECT (window->priv->recent_action), - "show-not-found", TRUE, - "local-only", FALSE, - "show-private", TRUE, - "show-tips", TRUE, - "sort-type", GTK_RECENT_SORT_MRU, - NULL); - gtk_recent_chooser_set_local_only (GTK_RECENT_CHOOSER (window->priv->recent_action), FALSE); - g_signal_connect (window->priv->recent_action, - "item-activated", - G_CALLBACK (activate_recent_cb), - window); - - action_group = gtk_action_group_new ("VinagreRecentConnectionsActions"); - gtk_action_group_set_translation_domain (action_group, NULL); - - gtk_ui_manager_insert_action_group (manager, action_group, 0); - g_object_unref (action_group); - window->priv->recent_action_group = action_group; - gtk_action_group_add_action (window->priv->recent_action_group, - window->priv->recent_action); - - filter = gtk_recent_filter_new (); - gtk_recent_filter_add_group (filter, "vinagre"); - gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (window->priv->recent_action), - filter); - - update_recent_connections (window); - - recent_manager = gtk_recent_manager_get_default (); - window->priv->update_recents_menu_ui_id = g_signal_connect ( - recent_manager, - "changed", - G_CALLBACK (recent_manager_changed), - window); - - g_signal_connect_swapped (vinagre_prefs_get_default (), - "notify::show-accels", - G_CALLBACK (show_hide_accels), - window); - show_hide_accels (window); -} - -void -vinagre_window_update_machine_menu_sensitivity (VinagreWindow *window) -{ - gboolean active; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - active = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->priv->notebook)) > 0; - gtk_action_group_set_sensitive (window->priv->action_group, active); - - active = (window->priv->active_tab) && - (vinagre_tab_get_state (VINAGRE_TAB (window->priv->active_tab)) == VINAGRE_TAB_STATE_CONNECTED); - gtk_action_group_set_sensitive (window->priv->machine_connected_action_group, active); -} - -static void -fav_panel_size_allocate (GtkWidget *widget, - GtkAllocation *allocation, - VinagreWindow *window) -{ - window->priv->side_panel_size = allocation->width; - if (window->priv->side_panel_size > 0) - g_object_set (vinagre_prefs_get_default (), - "side-panel-size", window->priv->side_panel_size, - NULL); -} - -static void -fav_panel_activated (VinagreFav *fav, - VinagreBookmarksEntry *entry, - VinagreWindow *window) -{ - g_return_if_fail (vinagre_bookmarks_entry_get_node (entry) == VINAGRE_BOOKMARKS_ENTRY_NODE_CONN); - - vinagre_cmd_open_bookmark (window, vinagre_bookmarks_entry_get_conn (entry)); -} - -static void -fav_panel_selected (VinagreFav *fav, - VinagreBookmarksEntry *entry, - VinagreWindow *window) -{ - GtkAction *action1, *action2; - - action1 = gtk_action_group_get_action (window->priv->always_sensitive_action_group, - "BookmarksDel"); - action2 = gtk_action_group_get_action (window->priv->always_sensitive_action_group, - "BookmarksEdit"); - - if (window->priv->fav_entry_selected) - { - g_object_unref (window->priv->fav_entry_selected); - window->priv->fav_entry_selected = NULL; - } - - if (entry) - { - window->priv->fav_entry_selected = g_object_ref (entry); - gtk_action_set_sensitive (action1, TRUE); - gtk_action_set_sensitive (action2, TRUE); - /* TODO: Change the menuitem label */ - } - else - { - /* TODO: Change the menuitem label */ - gtk_action_set_sensitive (action1, FALSE); - gtk_action_set_sensitive (action2, FALSE); - } -} - -static void -vinagre_window_populate_bookmarks (VinagreWindow *window, - const gchar *group, - GSList *entries, - const gchar *parent) -{ - static guint i = 0; - GSList *l; - VinagreBookmarksEntry *entry; - gchar *action_name, *action_label, *path, *tooltip; - GtkAction *action; - VinagreWindowPrivate *p = window->priv; - VinagreConnection *conn; - - for (l = entries; l; l = l->next) - { - entry = VINAGRE_BOOKMARKS_ENTRY (l->data); - switch (vinagre_bookmarks_entry_get_node (entry)) - { - case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: - action_label = vinagre_utils_escape_underscores (vinagre_bookmarks_entry_get_name (entry), -1); - action_name = g_strdup_printf ("BOOKMARK_FOLDER_ACTION_%d", ++i); - action = gtk_action_new (action_name, - action_label, - NULL, - NULL); - g_object_set (G_OBJECT (action), "icon-name", "folder", "hide-if-empty", FALSE, NULL); - gtk_action_group_add_action (p->bookmarks_list_action_group, - action); - g_object_unref (action); - - path = g_strdup_printf ("/MenuBar/BookmarksMenu/%s%s", group, parent?parent:""); - gtk_ui_manager_add_ui (p->manager, - p->bookmarks_list_menu_ui_id, - path, - action_label, action_name, - GTK_UI_MANAGER_MENU, - FALSE); - g_free (path); - g_free (action_name); - - path = g_strdup_printf ("%s/%s", parent?parent:"", action_label); - g_free (action_label); - - vinagre_window_populate_bookmarks (window, group, vinagre_bookmarks_entry_get_children (entry), path); - g_free (path); - break; - - case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: - conn = vinagre_bookmarks_entry_get_conn (entry); - - action_name = vinagre_connection_get_best_name (conn); - action_label = vinagre_utils_escape_underscores (action_name, -1); - g_free (action_name); - - action_name = g_strdup_printf ("BOOKMARK_ITEM_ACTION_%d", ++i); - - /* Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu */ - tooltip = g_strdup_printf (_("Open %s:%d"), - vinagre_connection_get_host (conn), - vinagre_connection_get_port (conn)); - action = gtk_action_new (action_name, - action_label, - tooltip, - NULL); - g_object_set (G_OBJECT (action), "icon-name", "application-x-vnc", NULL); - g_object_set_data (G_OBJECT (action), "conn", conn); - gtk_action_group_add_action (p->bookmarks_list_action_group, - action); - g_signal_connect (action, - "activate", - G_CALLBACK (vinagre_cmd_bookmarks_open), - window); - - path = g_strdup_printf ("/MenuBar/BookmarksMenu/%s%s", group, parent?parent:""); - gtk_ui_manager_add_ui (p->manager, - p->bookmarks_list_menu_ui_id, - path, - action_label, action_name, - GTK_UI_MANAGER_MENUITEM, - FALSE); - - g_object_unref (action); - g_free (action_name); - g_free (action_label); - g_free (tooltip); - g_free (path); - break; - - default: - g_assert_not_reached (); - } - } -} - -void -vinagre_window_update_bookmarks_list_menu (VinagreWindow *window) -{ - VinagreWindowPrivate *p = window->priv; - GList *actions, *l; - GSList *favs, *mdnss = NULL; - - g_return_if_fail (p->bookmarks_list_action_group != NULL); - - if (p->bookmarks_list_menu_ui_id != 0) - gtk_ui_manager_remove_ui (p->manager, p->bookmarks_list_menu_ui_id); - - actions = gtk_action_group_list_actions (p->bookmarks_list_action_group); - for (l = actions; l != NULL; l = l->next) - { - g_signal_handlers_disconnect_by_func (GTK_ACTION (l->data), - G_CALLBACK (vinagre_cmd_bookmarks_open), - window); - gtk_action_group_remove_action (p->bookmarks_list_action_group, - GTK_ACTION (l->data)); - } - g_list_free (actions); - - favs = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()); - -#ifdef VINAGRE_ENABLE_AVAHI - mdnss = vinagre_mdns_get_all (vinagre_mdns_get_default ()); -#endif - - p->bookmarks_list_menu_ui_id = (g_slist_length (favs) > 0||g_slist_length (mdnss) > 0) ? gtk_ui_manager_new_merge_id (p->manager) : 0; - vinagre_window_populate_bookmarks (window, "BookmarksList", favs, NULL); - vinagre_window_populate_bookmarks (window, "AvahiList", mdnss, NULL); -} - -static void -create_side_panel (VinagreWindow *window) -{ - window->priv->fav_panel = vinagre_fav_new (window); - - gtk_paned_pack1 (GTK_PANED (window->priv->hpaned), - window->priv->fav_panel, - FALSE, - FALSE); - - g_object_get (vinagre_prefs_get_default (), - "side-panel-size", &(window->priv->side_panel_size), - NULL); - gtk_paned_set_position (GTK_PANED (window->priv->hpaned), window->priv->side_panel_size); - - g_signal_connect (window->priv->fav_panel, - "size-allocate", - G_CALLBACK (fav_panel_size_allocate), - window); - g_signal_connect (window->priv->fav_panel, - "fav-activated", - G_CALLBACK (fav_panel_activated), - window); - g_signal_connect (window->priv->fav_panel, - "fav-selected", - G_CALLBACK (fav_panel_selected), - window); -} - -static void -init_widgets_visibility (VinagreWindow *window) -{ - GdkWindowState state; - gint w, h; - GtkAction *action; - gboolean visible; - VinagrePrefs *prefs = vinagre_prefs_get_default (); - - /* Remove and Edit bookmarks starts disabled */ - action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, - "BookmarksDel"); - gtk_action_set_sensitive (action, FALSE); - - action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, - "BookmarksEdit"); - gtk_action_set_sensitive (action, FALSE); - - /* side panel visibility */ - action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, - "ViewSidePanel"); - g_object_get (prefs, "side-panel-visible", &visible, NULL); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); - - /* toolbar visibility */ - action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, - "ViewToolbar"); - g_object_get (prefs, "toolbar-visible", &visible, NULL); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); - - /* statusbar visibility */ - action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, - "ViewStatusbar"); - g_object_get (prefs, "statusbar-visible", &visible, NULL); - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); - - g_object_get (prefs, - "window-state", &state, - "window-width", &w, - "window-height", &h, - NULL); - - gtk_window_set_default_size (GTK_WINDOW (window), w, h); - - if ((state & GDK_WINDOW_STATE_MAXIMIZED) != 0) - gtk_window_maximize (GTK_WINDOW (window)); - else - gtk_window_unmaximize (GTK_WINDOW (window)); -} - -static void -create_statusbar (VinagreWindow *window, - GtkWidget *main_box) -{ - window->priv->statusbar = gtk_statusbar_new (); - - window->priv->generic_message_cid = gtk_statusbar_get_context_id - (GTK_STATUSBAR (window->priv->statusbar), "generic_message"); - window->priv->tip_message_cid = gtk_statusbar_get_context_id - (GTK_STATUSBAR (window->priv->statusbar), "tip_message"); - - gtk_box_pack_end (GTK_BOX (main_box), - window->priv->statusbar, - FALSE, - TRUE, - 0); -} - -void -vinagre_window_set_title (VinagreWindow *window) -{ - gchar *title, *name, *grab; - - if (window->priv->active_tab == NULL) - { - gtk_window_set_title (GTK_WINDOW (window), g_get_application_name ()); - return; - } - - if (vinagre_tab_is_pointer_grab (VINAGRE_TAB (window->priv->active_tab))) - grab = g_strdup_printf (" (%s)", _("Press Ctrl+Alt to release the cursor")); - else - grab = g_strdup (""); - - name = vinagre_connection_get_best_name (vinagre_tab_get_conn (VINAGRE_TAB (window->priv->active_tab))); - title = g_strdup_printf ("%s%s - %s", - name, - grab, - g_get_application_name ()); - gtk_window_set_title (GTK_WINDOW (window), title); - g_free (title); - g_free (name); - g_free (grab); -} - -static void -update_toggle_machine_items (VinagreWindow *window) -{ - GtkAction *action; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - if (window->priv->active_tab == NULL) - { - action = gtk_action_group_get_action (window->priv->machine_connected_action_group, "ViewScaling"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE); - - action = gtk_action_group_get_action (window->priv->machine_connected_action_group, "ViewReadOnly"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE); - - return; - } - - action = gtk_action_group_get_action (window->priv->machine_connected_action_group, "ViewScaling"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - vinagre_tab_get_scaling (VINAGRE_TAB (window->priv->active_tab))); - - action = gtk_action_group_get_action (window->priv->machine_connected_action_group, "ViewReadOnly"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), - vinagre_tab_get_readonly (VINAGRE_TAB (window->priv->active_tab))); - -} - -static void -vinagre_window_page_removed (GtkNotebook *notebook, - GtkWidget *child, - guint page_num, - VinagreWindow *window) -{ - GtkNotebook *nb; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - nb = GTK_NOTEBOOK (window->priv->notebook); - - window->priv->active_tab = gtk_notebook_get_nth_page (nb, - gtk_notebook_get_current_page (nb)); - - if (!window->priv->active_tab && window->priv->fullscreen) - vinagre_window_toggle_fullscreen (window); - - vinagre_window_set_title (window); - update_toggle_machine_items (window); - vinagre_window_update_machine_menu_sensitivity (window); -} - -static void -vinagre_window_page_added (GtkNotebook *notebook, - GtkWidget *child, - guint page_num, - VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - window->priv->active_tab = child; - - vinagre_window_set_title (window); - update_toggle_machine_items (window); - vinagre_window_update_machine_menu_sensitivity (window); -} - -static void -vinagre_window_switch_page (GtkNotebook *notebook, - GtkNotebookPage *pg, - gint page_num, - VinagreWindow *window) -{ - GtkWidget *tab; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - tab = gtk_notebook_get_nth_page (notebook, page_num); - if (tab == window->priv->active_tab) - return; - - window->priv->active_tab = tab; - - vinagre_window_set_title (window); - update_toggle_machine_items (window); - vinagre_window_update_machine_menu_sensitivity (window); -} - -static void -create_notebook (VinagreWindow *window) -{ - window->priv->notebook = vinagre_notebook_new (window); - - gtk_paned_pack2 (GTK_PANED (window->priv->hpaned), - window->priv->notebook, - TRUE, - FALSE); - - window->priv->signal_notebook = - g_signal_connect_after (window->priv->notebook, - "page-removed", - G_CALLBACK (vinagre_window_page_removed), - window); - - g_signal_connect_after (window->priv->notebook, - "page-added", - G_CALLBACK (vinagre_window_page_added), - window); - - g_signal_connect (window->priv->notebook, - "switch_page", - G_CALLBACK (vinagre_window_switch_page), - window); - - gtk_widget_show (window->priv->notebook); -} - -static void -vinagre_window_clipboard_cb (GtkClipboard *cb, GdkEvent *event, VinagreWindow *window) -{ - gchar *text; - - if (!window->priv->active_tab) - return; - - if (gtk_clipboard_get_owner (cb) == G_OBJECT (window->priv->active_tab)) - return; - - text = gtk_clipboard_wait_for_text (cb); - if (!text) - return; - - vinagre_tab_paste_text (VINAGRE_TAB (window->priv->active_tab), text); - g_free (text); -} - -static void -vinagre_window_init_clipboard (VinagreWindow *window) -{ - GtkClipboard *cb; - - cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - window->priv->signal_clipboard = g_signal_connect (cb, - "owner-change", - G_CALLBACK (vinagre_window_clipboard_cb), - window); -} - -static void -vinagre_window_init (VinagreWindow *window) -{ - GtkWidget *main_box; - - gtk_window_set_default_icon_name ("vinagre"); - - window->priv = VINAGRE_WINDOW_GET_PRIVATE (window); - window->priv->active_tab = NULL; - window->priv->fav_entry_selected = NULL; - window->priv->fullscreen = FALSE; - window->priv->signal_notebook = 0; - - main_box = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (window), main_box); - gtk_widget_show (main_box); - - /* Add menu bar and toolbar bar */ - create_menu_bar_and_toolbar (window, main_box); - - /* Add status bar */ - create_statusbar (window, main_box); - - /* Add the main area */ - window->priv->hpaned = gtk_hpaned_new (); - gtk_box_pack_start (GTK_BOX (main_box), - window->priv->hpaned, - TRUE, - TRUE, - 0); - - /* setup notebook area */ - create_notebook (window); - - /* side panel */ - create_side_panel (window); - - gtk_widget_show (window->priv->hpaned); - - gtk_widget_grab_focus (window->priv->hpaned); - - init_widgets_visibility (window); - vinagre_window_update_machine_menu_sensitivity (window); - - vinagre_window_update_bookmarks_list_menu (window); - g_signal_connect_swapped (vinagre_bookmarks_get_default (), - "changed", - G_CALLBACK (vinagre_window_update_bookmarks_list_menu), - window); -#ifdef VINAGRE_ENABLE_AVAHI - g_signal_connect_swapped (vinagre_mdns_get_default (), - "changed", - G_CALLBACK (vinagre_window_update_bookmarks_list_menu), - window); -#endif - vinagre_window_init_clipboard (window); -} - -GtkWidget * -vinagre_window_get_notebook (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return window->priv->notebook; -} - -void -vinagre_window_close_tab (VinagreWindow *window, - VinagreTab *tab) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - vinagre_notebook_remove_tab (VINAGRE_NOTEBOOK (window->priv->notebook), - tab); -} - -void -vinagre_window_close_all_tabs (VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - vinagre_notebook_remove_all_tabs (VINAGRE_NOTEBOOK (window->priv->notebook)); -} - - -void -vinagre_window_set_active_tab (VinagreWindow *window, - VinagreTab *tab) -{ - gint page_num; - - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - g_return_if_fail (VINAGRE_IS_TAB (tab)); - - page_num = gtk_notebook_page_num (GTK_NOTEBOOK (window->priv->notebook), - GTK_WIDGET (tab)); - g_return_if_fail (page_num != -1); - - gtk_notebook_set_current_page (GTK_NOTEBOOK (window->priv->notebook), - page_num); -} - -VinagreWindow * -vinagre_window_new () -{ - return g_object_new (VINAGRE_TYPE_WINDOW, - "type", GTK_WINDOW_TOPLEVEL, - "title", g_get_application_name (), - NULL); -} - -gboolean -vinagre_window_is_fullscreen (VinagreWindow *window) -{ - return window->priv->fullscreen; -} - -void -vinagre_window_toggle_fullscreen (VinagreWindow *window) -{ - if (window->priv->fullscreen) - gtk_window_unfullscreen (GTK_WINDOW (window)); - else - gtk_window_fullscreen (GTK_WINDOW (window)); -} - -GtkWidget * -vinagre_window_get_statusbar (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return window->priv->statusbar; -} - -GtkWidget * -vinagre_window_get_toolbar (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return window->priv->toolbar; -} - -GtkWidget * -vinagre_window_get_menubar (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return window->priv->menubar; -} - -GtkActionGroup * -vinagre_window_get_main_action (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return window->priv->action_group; -} - -GtkActionGroup * -vinagre_window_get_sensitive_action (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return window->priv->always_sensitive_action_group; -} - -GtkActionGroup * -vinagre_window_get_connected_action (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return window->priv->machine_connected_action_group; -} - -GtkWidget * -vinagre_window_get_fav_panel (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return window->priv->fav_panel; -} - -void -vinagre_window_close_active_tab (VinagreWindow *window) -{ - g_return_if_fail (VINAGRE_IS_WINDOW (window)); - - vinagre_window_close_tab (window, - VINAGRE_TAB (window->priv->active_tab)); -} - -VinagreTab * -vinagre_window_get_active_tab (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return VINAGRE_TAB (window->priv->active_tab); -} - -GtkUIManager * -vinagre_window_get_ui_manager (VinagreWindow *window) -{ - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - return window->priv->manager; -} - -static void -add_connection (VinagreTab *tab, GList **res) -{ - VinagreConnection *conn; - - conn = vinagre_tab_get_conn (tab); - - *res = g_list_prepend (*res, conn); -} - -/* Returns a newly allocated list with all the connections in the window */ -GList * -vinagre_window_get_connections (VinagreWindow *window) -{ - GList *res = NULL; - - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - - gtk_container_foreach (GTK_CONTAINER (window->priv->notebook), - (GtkCallback)add_connection, - &res); - - res = g_list_reverse (res); - - return res; -} - -VinagreTab * -vinagre_window_conn_exists (VinagreWindow *window, VinagreConnection *conn) -{ - VinagreConnection *c; - VinagreTab *tab = NULL; - GList *l; - - g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); - g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); - - l = vinagre_window_get_connections (window); - - while (l != NULL) - { - c = VINAGRE_CONNECTION (l->data); - - if (!strcmp (vinagre_connection_get_host (conn), vinagre_connection_get_host (c)) && - vinagre_connection_get_port (conn) == vinagre_connection_get_port (c)) - { - tab = g_object_get_data (G_OBJECT (c), VINAGRE_TAB_KEY); - break; - } - l = l->next; - } - g_list_free (l); - - return tab; -} - -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-window.h vinagre-2.29.1/src/vinagre-window.h --- vinagre-2.26.1/src/vinagre-window.h 2008-10-17 21:44:24.000000000 +0100 +++ vinagre-2.29.1/src/vinagre-window.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,102 +0,0 @@ -/* - * vinagre-window.h - * This file is part of vinagre - * - * Copyright (C) 2007 - Jonh Wendell - * - * This program 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANWINDOWILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_WINDOW_H__ -#define __VINAGRE_WINDOW_H__ - -#include - -G_BEGIN_DECLS - -#define VINAGRE_TYPE_WINDOW (vinagre_window_get_type()) -#define VINAGRE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_WINDOW, VinagreWindow)) -#define VINAGRE_WINDOW_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_WINDOW, VinagreWindow const)) -#define VINAGRE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_WINDOW, VinagreWindowClass)) -#define VINAGRE_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_WINDOW)) -#define VINAGRE_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_WINDOW)) -#define VINAGRE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_WINDOW, VinagreWindowClass)) - -typedef struct _VinagreWindowPrivate VinagreWindowPrivate; -typedef struct _VinagreWindow VinagreWindow; -typedef struct _VinagreWindowClass VinagreWindowClass; - -#include "vinagre-tab.h" -#include "vinagre-bookmarks.h" - -struct _VinagreWindow -{ - GtkWindow window; - VinagreWindowPrivate *priv; -}; - -struct _VinagreWindowClass -{ - GtkWindowClass parent_class; -}; - -GType vinagre_window_get_type (void) G_GNUC_CONST; - -VinagreWindow *vinagre_window_new (void); - -VinagreTab *vinagre_window_create_tab (VinagreWindow *window, - gboolean jump_to); - -void vinagre_window_close_tab (VinagreWindow *window, - VinagreTab *tab); -void vinagre_window_close_active_tab (VinagreWindow *window); - -void vinagre_window_close_all_tabs (VinagreWindow *window); - -void vinagre_window_close_tabs (VinagreWindow *window, - const GList *tabs); - -VinagreTab *vinagre_window_get_active_tab (VinagreWindow *window); - -void vinagre_window_set_active_tab (VinagreWindow *window, - VinagreTab *tab); - -GtkWidget *vinagre_window_get_statusbar (VinagreWindow *window); -GtkWidget *vinagre_window_get_toolbar (VinagreWindow *window); -GtkWidget *vinagre_window_get_menubar (VinagreWindow *window); -GtkWidget *vinagre_window_get_fav_panel (VinagreWindow *window); -GtkWidget *vinagre_window_get_notebook (VinagreWindow *window); -GtkActionGroup *vinagre_window_get_main_action (VinagreWindow *window); -GtkActionGroup *vinagre_window_get_sensitive_action (VinagreWindow *window); -GtkActionGroup *vinagre_window_get_connected_action (VinagreWindow *window); - -void vinagre_window_update_bookmarks_list_menu (VinagreWindow *window); - -GtkUIManager *vinagre_window_get_ui_manager (VinagreWindow *window); - -gboolean vinagre_window_is_fullscreen (VinagreWindow *window); - -void vinagre_window_toggle_fullscreen (VinagreWindow *window); -void vinagre_window_set_title (VinagreWindow *window); - -void vinagre_window_update_machine_menu_sensitivity (VinagreWindow *window); - -GList *vinagre_window_get_connections (VinagreWindow *window); -VinagreTab *vinagre_window_conn_exists (VinagreWindow *window, - VinagreConnection *conn); - -G_END_DECLS - -#endif /* __VINAGRE_WINDOW_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/src/vinagre-window-private.h vinagre-2.29.1/src/vinagre-window-private.h --- vinagre-2.26.1/src/vinagre-window-private.h 2008-11-28 17:59:10.000000000 +0000 +++ vinagre-2.29.1/src/vinagre-window-private.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -/* - * vinagre-window-private.h - * This file is part of vinagre - * - * Copyright (C) 2007,2008 - Jonh Wendell - * - * This program 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANWINDOWILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __VINAGRE_WINDOW_PRIVATE_H__ -#define __VINAGRE_WINDOW_PRIVATE_H__ - -#include "vinagre-window.h" -#include "vinagre-bookmarks-entry.h" - -G_BEGIN_DECLS - -/* WindowPrivate is in a separate .h so that we can access it from vinagre-commands */ - -struct _VinagreWindowPrivate -{ - GtkWidget *notebook; - GtkWidget *fav_panel; - GtkWidget *statusbar; - guint generic_message_cid; - guint tip_message_cid; - - GtkWidget *hpaned; - - /* Menus & Toolbars */ - GtkUIManager *manager; - GtkActionGroup *action_group; - GtkActionGroup *always_sensitive_action_group; - GtkActionGroup *machine_connected_action_group; - GtkActionGroup *bookmarks_list_action_group; - GtkActionGroup *recent_action_group; - GtkAction *recent_action; - guint bookmarks_list_menu_ui_id; - guint recents_menu_ui_id; - guint update_recents_menu_ui_id; - - GtkWidget *toolbar; - GtkWidget *menubar; - - GtkWidget *active_tab; - VinagreBookmarksEntry *fav_entry_selected; - - gint width; - gint height; - GdkWindowState window_state; - gint side_panel_size; - - gboolean fullscreen; - gboolean toolbar_visible; - gboolean statusbar_visible; - gboolean fav_panel_visible; - - gulong signal_notebook; - gulong signal_clipboard; -}; - - -G_END_DECLS - -#endif /* __VINAGRE_WINDOW_PRIVATE_H__ */ -/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/bacon-message-connection.c vinagre-2.29.1/vinagre/bacon-message-connection.c --- vinagre-2.26.1/vinagre/bacon-message-connection.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/bacon-message-connection.c 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,396 @@ +/* + * Copyright (C) 2003 Bastien Nocera + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bacon-message-connection.h" + +#ifndef UNIX_PATH_MAX +#define UNIX_PATH_MAX 108 +#endif + +struct BaconMessageConnection { + /* A server accepts connections */ + gboolean is_server; + + /* The socket path itself */ + char *path; + + /* File descriptor of the socket */ + int fd; + /* Channel to watch */ + GIOChannel *chan; + /* Event id returned by g_io_add_watch() */ + int conn_id; + + /* Connections accepted by this connection */ + GSList *accepted_connections; + + /* callback */ + void (*func) (const char *message, gpointer user_data); + gpointer data; +}; + +static gboolean +test_is_socket (const char *path) +{ + struct stat s; + + if (stat (path, &s) == -1) + return FALSE; + + if (S_ISSOCK (s.st_mode)) + return TRUE; + + return FALSE; +} + +static gboolean +is_owned_by_user_and_socket (const char *path) +{ + struct stat s; + + if (stat (path, &s) == -1) + return FALSE; + + if (s.st_uid != geteuid ()) + return FALSE; + + if ((s.st_mode & S_IFSOCK) != S_IFSOCK) + return FALSE; + + return TRUE; +} + +static gboolean server_cb (GIOChannel *source, + GIOCondition condition, gpointer data); + +static gboolean +setup_connection (BaconMessageConnection *conn) +{ + g_return_val_if_fail (conn->chan == NULL, FALSE); + + conn->chan = g_io_channel_unix_new (conn->fd); + if (!conn->chan) { + return FALSE; + } + g_io_channel_set_line_term (conn->chan, "\n", 1); + conn->conn_id = g_io_add_watch (conn->chan, G_IO_IN, server_cb, conn); + + return TRUE; +} + +static void +accept_new_connection (BaconMessageConnection *server_conn) +{ + BaconMessageConnection *conn; + int alen; + + g_return_if_fail (server_conn->is_server); + + conn = g_new0 (BaconMessageConnection, 1); + conn->is_server = FALSE; + conn->func = server_conn->func; + conn->data = server_conn->data; + + conn->fd = accept (server_conn->fd, NULL, (guint *)&alen); + + server_conn->accepted_connections = + g_slist_prepend (server_conn->accepted_connections, conn); + + setup_connection (conn); +} + +static gboolean +server_cb (GIOChannel *source, GIOCondition condition, gpointer data) +{ + BaconMessageConnection *conn = (BaconMessageConnection *)data; + char *message, *subs, buf; + int cd, rc, offset; + gboolean finished; + + offset = 0; + if (conn->is_server && conn->fd == g_io_channel_unix_get_fd (source)) { + accept_new_connection (conn); + return TRUE; + } + message = g_malloc (1); + cd = conn->fd; + rc = read (cd, &buf, 1); + while (rc > 0 && buf != '\n') + { + message = g_realloc (message, rc + offset + 1); + message[offset] = buf; + offset = offset + rc; + rc = read (cd, &buf, 1); + } + if (rc <= 0) { + g_io_channel_shutdown (conn->chan, FALSE, NULL); + g_io_channel_unref (conn->chan); + conn->chan = NULL; + close (conn->fd); + conn->fd = -1; + g_free (message); + conn->conn_id = 0; + + return FALSE; + } + message[offset] = '\0'; + + subs = message; + finished = FALSE; + + while (finished == FALSE && *subs != '\0') + { + if (conn->func != NULL) + (*conn->func) (subs, conn->data); + + subs += strlen (subs) + 1; + if (subs - message >= offset) + finished = TRUE; + } + + g_free (message); + + return TRUE; +} + +static char * +find_file_with_pattern (const char *dir, const char *pattern) +{ + GDir *filedir; + char *found_filename; + const char *filename; + GPatternSpec *pat; + + filedir = g_dir_open (dir, 0, NULL); + if (filedir == NULL) + return NULL; + + pat = g_pattern_spec_new (pattern); + if (pat == NULL) + { + g_dir_close (filedir); + return NULL; + } + + found_filename = NULL; + + while ((filename = g_dir_read_name (filedir))) + { + if (g_pattern_match_string (pat, filename)) + { + char *tmp = g_build_filename (dir, filename, NULL); + if (is_owned_by_user_and_socket (tmp)) + found_filename = g_strdup (filename); + g_free (tmp); + } + + if (found_filename != NULL) + break; + } + + g_pattern_spec_free (pat); + g_dir_close (filedir); + + return found_filename; +} + +static char * +socket_filename (const char *prefix) +{ + char *pattern, *newfile, *path, *filename; + const char *tmpdir; + + pattern = g_strdup_printf ("%s.%s.*", prefix, g_get_user_name ()); + tmpdir = g_get_tmp_dir (); + filename = find_file_with_pattern (tmpdir, pattern); + if (filename == NULL) + { + newfile = g_strdup_printf ("%s.%s.%u", prefix, + g_get_user_name (), g_random_int ()); + path = g_build_filename (tmpdir, newfile, NULL); + g_free (newfile); + } else { + path = g_build_filename (tmpdir, filename, NULL); + g_free (filename); + } + + g_free (pattern); + return path; +} + +static gboolean +try_server (BaconMessageConnection *conn) +{ + struct sockaddr_un uaddr; + + uaddr.sun_family = AF_UNIX; + strncpy (uaddr.sun_path, conn->path, + MIN (strlen(conn->path)+1, UNIX_PATH_MAX)); + conn->fd = socket (PF_UNIX, SOCK_STREAM, 0); + if (bind (conn->fd, (struct sockaddr *) &uaddr, sizeof (uaddr)) == -1) + { + conn->fd = -1; + return FALSE; + } + listen (conn->fd, 5); + + if (!setup_connection (conn)) + return FALSE; + return TRUE; +} + +static gboolean +try_client (BaconMessageConnection *conn) +{ + struct sockaddr_un uaddr; + + uaddr.sun_family = AF_UNIX; + strncpy (uaddr.sun_path, conn->path, + MIN(strlen(conn->path)+1, UNIX_PATH_MAX)); + conn->fd = socket (PF_UNIX, SOCK_STREAM, 0); + if (connect (conn->fd, (struct sockaddr *) &uaddr, + sizeof (uaddr)) == -1) + { + conn->fd = -1; + return FALSE; + } + + return setup_connection (conn); +} + +BaconMessageConnection * +bacon_message_connection_new (const char *prefix) +{ + BaconMessageConnection *conn; + + g_return_val_if_fail (prefix != NULL, NULL); + + conn = g_new0 (BaconMessageConnection, 1); + conn->path = socket_filename (prefix); + + if (test_is_socket (conn->path) == FALSE) + { + if (!try_server (conn)) + { + bacon_message_connection_free (conn); + return NULL; + } + + conn->is_server = TRUE; + return conn; + } + + if (try_client (conn) == FALSE) + { + unlink (conn->path); + try_server (conn); + if (conn->fd == -1) + { + bacon_message_connection_free (conn); + return NULL; + } + + conn->is_server = TRUE; + return conn; + } + + conn->is_server = FALSE; + return conn; +} + +void +bacon_message_connection_free (BaconMessageConnection *conn) +{ + GSList *child_conn; + + g_return_if_fail (conn != NULL); + /* Only servers can accept other connections */ + g_return_if_fail (conn->is_server != FALSE || + conn->accepted_connections == NULL); + + child_conn = conn->accepted_connections; + while (child_conn != NULL) { + bacon_message_connection_free (child_conn->data); + child_conn = g_slist_next (child_conn); + } + g_slist_free (conn->accepted_connections); + + if (conn->conn_id) { + g_source_remove (conn->conn_id); + conn->conn_id = 0; + } + if (conn->chan) { + g_io_channel_shutdown (conn->chan, FALSE, NULL); + g_io_channel_unref (conn->chan); + } + + if (conn->is_server != FALSE) { + unlink (conn->path); + } + if (conn->fd != -1) { + close (conn->fd); + } + + g_free (conn->path); + g_free (conn); +} + +void +bacon_message_connection_set_callback (BaconMessageConnection *conn, + BaconMessageReceivedFunc func, + gpointer user_data) +{ + g_return_if_fail (conn != NULL); + + conn->func = func; + conn->data = user_data; +} + +void +bacon_message_connection_send (BaconMessageConnection *conn, + const char *message) +{ + g_return_if_fail (conn != NULL); + g_return_if_fail (message != NULL); + + g_io_channel_write_chars (conn->chan, message, strlen (message), + NULL, NULL); + g_io_channel_write_chars (conn->chan, "\n", 1, NULL, NULL); + g_io_channel_flush (conn->chan, NULL); +} + +gboolean +bacon_message_connection_get_is_server (BaconMessageConnection *conn) +{ + g_return_val_if_fail (conn != NULL, FALSE); + + return conn->is_server; +} + diff -Nru vinagre-2.26.1/vinagre/bacon-message-connection.h vinagre-2.29.1/vinagre/bacon-message-connection.h --- vinagre-2.26.1/vinagre/bacon-message-connection.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/bacon-message-connection.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2003 Bastien Nocera + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#ifndef BACON_MESSAGE_CONNECTION_H +#define BACON_MESSAGE_CONNECTION_H + +#include + +G_BEGIN_DECLS + +typedef void (*BaconMessageReceivedFunc) (const char *message, + gpointer user_data); + +typedef struct BaconMessageConnection BaconMessageConnection; + +BaconMessageConnection *bacon_message_connection_new (const char *prefix); +void bacon_message_connection_free (BaconMessageConnection *conn); +void bacon_message_connection_set_callback (BaconMessageConnection *conn, + BaconMessageReceivedFunc func, + gpointer user_data); +void bacon_message_connection_send (BaconMessageConnection *conn, + const char *message); +gboolean bacon_message_connection_get_is_server (BaconMessageConnection *conn); + +G_END_DECLS + +#endif /* BACON_MESSAGE_CONNECTION_H */ diff -Nru vinagre-2.26.1/vinagre/GNOME_VinagreApplet.server.in.in vinagre-2.29.1/vinagre/GNOME_VinagreApplet.server.in.in --- vinagre-2.26.1/vinagre/GNOME_VinagreApplet.server.in.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/GNOME_VinagreApplet.server.in.in 2009-09-09 15:50:29.000000000 +0100 @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru vinagre-2.26.1/vinagre/Makefile.am vinagre-2.29.1/vinagre/Makefile.am --- vinagre-2.26.1/vinagre/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/Makefile.am 2009-08-06 19:11:18.000000000 +0100 @@ -0,0 +1,275 @@ +SUBDIRS = view + +NULL = + +INCLUDES = \ + -DBINDIR=\"$(bindir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DPREFIX=\""$(prefix)"\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ + -DVINAGRE_DATADIR=\""$(datadir)/vinagre"\" \ + -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ + $(VINAGRE_CFLAGS) \ + $(AVAHI_CFLAGS) \ + $(NULL) + +NOINST_H_FILES = \ + bacon-message-connection.h \ + vinagre-enums.h \ + vinagre-object-module.h \ + vinagre-plugin-info.h \ + vinagre-plugin-info-priv.h \ + vinagre-plugin-loader.h \ + vinagre-plugin-manager.h \ + vinagre-plugin-dialog.h \ + vinagre-plugins-engine.h \ + vinagre-window-private.h \ + vinagre-spinner.h \ + $(NULL) + +INST_H_FILES = \ + vinagre-app.h \ + vinagre-bacon.h \ + vinagre-bookmarks-entry.h \ + vinagre-bookmarks.h \ + vinagre-bookmarks-migration.h \ + vinagre-bookmarks-tree.h \ + vinagre-bookmarks-ui.h \ + vinagre-commands.h \ + vinagre-connect.h \ + vinagre-connection.h \ + vinagre-debug.h \ + vinagre-dirs.h \ + vinagre-fav.h \ + vinagre-notebook.h \ + vinagre-plugin.h \ + vinagre-plugin-loader.h \ + vinagre-prefs.h \ + vinagre-tab.h \ + vinagre-ui.h \ + vinagre-utils.h \ + vinagre-window.h \ + vinagre-dnd.h \ + $(NULL) + +headerdir = $(prefix)/include/vinagre-@VINAGRE_API_VERSION@/vinagre +header_DATA = $(INST_H_FILES) + +############################## +# The main library +############################## + +noinst_LTLIBRARIES = libvinagre.la + +libvinagre_la_SOURCES = \ + bacon-message-connection.c \ + vinagre-app.c \ + vinagre-bacon.c \ + vinagre-bookmarks.c \ + vinagre-bookmarks-entry.c \ + vinagre-bookmarks-migration.c \ + vinagre-bookmarks-tree.c \ + vinagre-bookmarks-ui.c \ + vinagre-commands.c \ + vinagre-connect.c \ + vinagre-connection.c \ + vinagre-debug.c \ + vinagre-dirs.c \ + vinagre-enums.c \ + vinagre-fav.c \ + vinagre-notebook.c \ + vinagre-object-module.c \ + vinagre-plugin.c \ + vinagre-plugin-info.c \ + vinagre-plugin-dialog.c \ + vinagre-plugin-loader.c \ + vinagre-plugin-manager.c \ + vinagre-plugins-engine.c \ + vinagre-prefs.c \ + vinagre-tab.c \ + vinagre-utils.c \ + vinagre-window.c \ + vinagre-spinner.c \ + $(NOINST_H_FILES) \ + $(INST_H_FILES) \ + $(NULL) + +if AVAHI +libvinagre_la_SOURCES += vinagre-mdns.h vinagre-mdns.c +endif + +libvinagre_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" + +libvinagre_la_LIBADD = view/libview.la +# VINAGRE_LIBS must be the last to ensure correct order on some platforms +libvinagre_la_LIBADD += $(VINAGRE_LIBS) + + +############################## +# The main binary +############################## + +bin_PROGRAMS = vinagre + +vinagre_SOURCES = \ + vinagre-main.c + +vinagre_LDADD = \ + libvinagre.la \ + $(VINAGRE_LIBS) \ + $(AVAHI_LIBS) \ + $(GTKVNC_LIBS) \ + $(NULL) + +vinagre_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" + +if APPLET + +############################## +# Bonobo .server +############################## + +serverdir = \ + $(libdir)/bonobo/servers +server_in_files = \ + GNOME_VinagreApplet.server.in +server_DATA = \ + $(server_in_files:.server.in=.server) + +$(server_in_files): $(server_in_files:.server.in=.server.in.in) + sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ + +@INTLTOOL_SERVER_RULE@ + +############################## +# The applet binary +############################## + +libexec_PROGRAMS = vinagre-applet + +vinagre_applet_CFLAGS = \ + $(APPLET_CFLAGS) \ + $(AVAHI_CFLAGS) \ + $(NULL) + +vinagre_applet_SOURCES = \ + vinagre-applet.c \ + vinagre-bookmarks.h vinagre-bookmarks.c \ + vinagre-bookmarks-ui.h vinagre-bookmarks-ui.c \ + vinagre-connection.h vinagre-connection.c \ + vinagre-utils.h vinagre-utils.c \ + vinagre-enums.h vinagre-enums.c \ + vinagre-bookmarks-entry.h vinagre-bookmarks-entry.c \ + vinagre-bookmarks-tree.h vinagre-bookmarks-tree.c \ + vinagre-bookmarks-migration.h vinagre-bookmarks-migration.c \ + vinagre-plugins-engine.h vinagre-plugins-engine.c \ + vinagre-plugin.h vinagre-plugin.c \ + vinagre-plugin-loader.h vinagre-plugin-loader.c \ + vinagre-plugin-manager.h vinagre-plugin-manager.c \ + vinagre-plugin-dialog.h vinagre-plugin-dialog.c \ + vinagre-debug.h vinagre-debug.c \ + vinagre-plugin-info.h vinagre-plugin-info.c \ + vinagre-window.h vinagre-window.c \ + vinagre-commands.h vinagre-commands.c \ + vinagre-notebook.h vinagre-notebook.c \ + vinagre-tab.h vinagre-tab.c \ + vinagre-prefs.h vinagre-prefs.c \ + vinagre-app.h vinagre-app.c \ + vinagre-object-module.h vinagre-object-module.c \ + vinagre-dirs.h vinagre-dirs.c \ + vinagre-fav.h vinagre-fav.c \ + vinagre-connect.h vinagre-connect.c \ + vinagre-spinner.h vinagre-spinner.c \ + $(NULL) + +if AVAHI +vinagre_applet_SOURCES += vinagre-mdns.h vinagre-mdns.c +endif + +vinagre_applet_LDADD = \ + view/libview.la \ + $(APPLET_LIBS) \ + $(VINAGRE_LIBS) \ + $(AVAHI_LIBS) \ + $(NULL) +vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" + +endif + +############################## +# Autogenerated stuff +############################## + +vinagre_enum_headers = \ + $(top_srcdir)/vinagre/vinagre-connection.h \ + $(NULL) + +vinagre-enums.c: @REBUILD@ $(vinagre_enum_headers) + glib-mkenums --fhead "#include \n" \ + --fhead "#include \"vinagre-enums.h\"\n\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --fprod "\n#include \"@filename@\"\n" \ + --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n};\n\n" \ + --vtail "GType\n@enum_name@_get_type (void)\n{\n" \ + --vtail " static GType type = 0;\n\n" \ + --vtail " if (!type)\n" \ + --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ + --vtail " return type;\n}\n\n" \ + $(vinagre_enum_headers) > $@ + +vinagre-enums.h: @REBUILD@ $(vinagre_enum_headers) + glib-mkenums --fhead "#ifndef __VINAGRE_ENUMS_H__\n" \ + --fhead "#define __VINAGRE_ENUMS_H__ 1\n\n" \ + --fhead "G_BEGIN_DECLS\n\n" \ + --ftail "G_END_DECLS\n\n" \ + --ftail "#endif /* __VINAGRE_ENUMS_H__ */\n" \ + --fprod "\n/* --- @filename@ --- */" \ + --eprod "#define VINAGRE_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ + --eprod "GType @enum_name@_get_type (void);\n" \ + $(vinagre_enum_headers) > $@ + +BUILT_SOURCES = \ + vinagre-enums.c \ + vinagre-enums.h \ + $(NULL) + +############################## +# Telepathy stuff +############################## + +if TELEPATHY + +INCLUDES += $(TELEPATHY_CFLAGS) +vinagre_LDADD += $(TELEPATHY_LIBS) +libvinagre_la_SOURCES += \ + vinagre-tubes-manager.c vinagre-tubes-manager.h \ + vinagre-tube-handler.c vinagre-tube-handler.h \ + $(NULL) + +dbus-interface-glue.h: tube-handler.xml + dbus-binding-tool --prefix=vinagre_tubes_manager --mode=glib-server $< > dbus-interface-glue.h + +BUILT_SOURCES += dbus-interface-glue.h + +endif + +DISTCLEANFILES = \ + $(BUILT_SOURCES) \ + $(server_in_files) \ + $(server_DATA) \ + $(NULL) + +EXTRA_DIST = \ + GNOME_VinagreApplet.server.in.in \ + tube-handler.xml \ + $(NULL) + +dist-hook: + cd $(distdir) ; rm -f $(DISTCLEANFILES) + +$(vinagre_OBJECTS): $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/vinagre/Makefile.in vinagre-2.29.1/vinagre/Makefile.in --- vinagre-2.26.1/vinagre/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/Makefile.in 2009-10-26 13:35:26.000000000 +0000 @@ -0,0 +1,1698 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +@AVAHI_TRUE@am__append_1 = vinagre-mdns.h vinagre-mdns.c +bin_PROGRAMS = vinagre$(EXEEXT) +@APPLET_TRUE@libexec_PROGRAMS = vinagre-applet$(EXEEXT) +@APPLET_TRUE@@AVAHI_TRUE@am__append_2 = vinagre-mdns.h vinagre-mdns.c + +############################## +# Telepathy stuff +############################## +@TELEPATHY_TRUE@am__append_3 = $(TELEPATHY_CFLAGS) +@TELEPATHY_TRUE@am__append_4 = $(TELEPATHY_LIBS) +@TELEPATHY_TRUE@am__append_5 = \ +@TELEPATHY_TRUE@ vinagre-tubes-manager.c vinagre-tubes-manager.h \ +@TELEPATHY_TRUE@ vinagre-tube-handler.c vinagre-tube-handler.h \ +@TELEPATHY_TRUE@ $(NULL) + +@TELEPATHY_TRUE@am__append_6 = dbus-interface-glue.h +subdir = vinagre +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +am__DEPENDENCIES_1 = +libvinagre_la_DEPENDENCIES = view/libview.la $(am__DEPENDENCIES_1) +am__libvinagre_la_SOURCES_DIST = bacon-message-connection.c \ + vinagre-app.c vinagre-bacon.c vinagre-bookmarks.c \ + vinagre-bookmarks-entry.c vinagre-bookmarks-migration.c \ + vinagre-bookmarks-tree.c vinagre-bookmarks-ui.c \ + vinagre-commands.c vinagre-connect.c vinagre-connection.c \ + vinagre-debug.c vinagre-dirs.c vinagre-enums.c vinagre-fav.c \ + vinagre-notebook.c vinagre-object-module.c vinagre-plugin.c \ + vinagre-plugin-info.c vinagre-plugin-dialog.c \ + vinagre-plugin-loader.c vinagre-plugin-manager.c \ + vinagre-plugins-engine.c vinagre-prefs.c vinagre-tab.c \ + vinagre-utils.c vinagre-window.c vinagre-spinner.c \ + bacon-message-connection.h vinagre-enums.h \ + vinagre-object-module.h vinagre-plugin-info.h \ + vinagre-plugin-info-priv.h vinagre-plugin-loader.h \ + vinagre-plugin-manager.h vinagre-plugin-dialog.h \ + vinagre-plugins-engine.h vinagre-window-private.h \ + vinagre-spinner.h vinagre-app.h vinagre-bacon.h \ + vinagre-bookmarks-entry.h vinagre-bookmarks.h \ + vinagre-bookmarks-migration.h vinagre-bookmarks-tree.h \ + vinagre-bookmarks-ui.h vinagre-commands.h vinagre-connect.h \ + vinagre-connection.h vinagre-debug.h vinagre-dirs.h \ + vinagre-fav.h vinagre-notebook.h vinagre-plugin.h \ + vinagre-prefs.h vinagre-tab.h vinagre-ui.h vinagre-utils.h \ + vinagre-window.h vinagre-dnd.h vinagre-mdns.h vinagre-mdns.c \ + vinagre-tubes-manager.c vinagre-tubes-manager.h \ + vinagre-tube-handler.c vinagre-tube-handler.h +am__objects_1 = +am__objects_2 = $(am__objects_1) +@AVAHI_TRUE@am__objects_3 = vinagre-mdns.lo +@TELEPATHY_TRUE@am__objects_4 = vinagre-tubes-manager.lo \ +@TELEPATHY_TRUE@ vinagre-tube-handler.lo $(am__objects_1) +am_libvinagre_la_OBJECTS = bacon-message-connection.lo vinagre-app.lo \ + vinagre-bacon.lo vinagre-bookmarks.lo \ + vinagre-bookmarks-entry.lo vinagre-bookmarks-migration.lo \ + vinagre-bookmarks-tree.lo vinagre-bookmarks-ui.lo \ + vinagre-commands.lo vinagre-connect.lo vinagre-connection.lo \ + vinagre-debug.lo vinagre-dirs.lo vinagre-enums.lo \ + vinagre-fav.lo vinagre-notebook.lo vinagre-object-module.lo \ + vinagre-plugin.lo vinagre-plugin-info.lo \ + vinagre-plugin-dialog.lo vinagre-plugin-loader.lo \ + vinagre-plugin-manager.lo vinagre-plugins-engine.lo \ + vinagre-prefs.lo vinagre-tab.lo vinagre-utils.lo \ + vinagre-window.lo vinagre-spinner.lo $(am__objects_2) \ + $(am__objects_2) $(am__objects_1) $(am__objects_3) \ + $(am__objects_4) +libvinagre_la_OBJECTS = $(am_libvinagre_la_OBJECTS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +libvinagre_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libvinagre_la_LDFLAGS) $(LDFLAGS) -o $@ +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ + "$(DESTDIR)$(headerdir)" "$(DESTDIR)$(serverdir)" +PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) +am_vinagre_OBJECTS = vinagre-main.$(OBJEXT) +vinagre_OBJECTS = $(am_vinagre_OBJECTS) +@TELEPATHY_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +vinagre_DEPENDENCIES = libvinagre.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) +vinagre_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(vinagre_LDFLAGS) $(LDFLAGS) -o $@ +am__vinagre_applet_SOURCES_DIST = vinagre-applet.c vinagre-bookmarks.h \ + vinagre-bookmarks.c vinagre-bookmarks-ui.h \ + vinagre-bookmarks-ui.c vinagre-connection.h \ + vinagre-connection.c vinagre-utils.h vinagre-utils.c \ + vinagre-enums.h vinagre-enums.c vinagre-bookmarks-entry.h \ + vinagre-bookmarks-entry.c vinagre-bookmarks-tree.h \ + vinagre-bookmarks-tree.c vinagre-bookmarks-migration.h \ + vinagre-bookmarks-migration.c vinagre-plugins-engine.h \ + vinagre-plugins-engine.c vinagre-plugin.h vinagre-plugin.c \ + vinagre-plugin-loader.h vinagre-plugin-loader.c \ + vinagre-plugin-manager.h vinagre-plugin-manager.c \ + vinagre-plugin-dialog.h vinagre-plugin-dialog.c \ + vinagre-debug.h vinagre-debug.c vinagre-plugin-info.h \ + vinagre-plugin-info.c vinagre-window.h vinagre-window.c \ + vinagre-commands.h vinagre-commands.c vinagre-notebook.h \ + vinagre-notebook.c vinagre-tab.h vinagre-tab.c vinagre-prefs.h \ + vinagre-prefs.c vinagre-app.h vinagre-app.c \ + vinagre-object-module.h vinagre-object-module.c vinagre-dirs.h \ + vinagre-dirs.c vinagre-fav.h vinagre-fav.c vinagre-connect.h \ + vinagre-connect.c vinagre-spinner.h vinagre-spinner.c \ + vinagre-mdns.h vinagre-mdns.c +@APPLET_TRUE@@AVAHI_TRUE@am__objects_5 = vinagre_applet-vinagre-mdns.$(OBJEXT) +@APPLET_TRUE@am_vinagre_applet_OBJECTS = \ +@APPLET_TRUE@ vinagre_applet-vinagre-applet.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-bookmarks.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-bookmarks-ui.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-connection.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-utils.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-enums.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-bookmarks-entry.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-bookmarks-tree.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-bookmarks-migration.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-plugins-engine.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-plugin.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-plugin-loader.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-plugin-manager.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-plugin-dialog.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-debug.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-plugin-info.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-window.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-commands.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-notebook.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-tab.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-prefs.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-app.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-object-module.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-dirs.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-fav.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-connect.$(OBJEXT) \ +@APPLET_TRUE@ vinagre_applet-vinagre-spinner.$(OBJEXT) \ +@APPLET_TRUE@ $(am__objects_1) $(am__objects_5) +vinagre_applet_OBJECTS = $(am_vinagre_applet_OBJECTS) +@APPLET_TRUE@vinagre_applet_DEPENDENCIES = view/libview.la \ +@APPLET_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@APPLET_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +vinagre_applet_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(vinagre_applet_CFLAGS) $(CFLAGS) $(vinagre_applet_LDFLAGS) \ + $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libvinagre_la_SOURCES) $(vinagre_SOURCES) \ + $(vinagre_applet_SOURCES) +DIST_SOURCES = $(am__libvinagre_la_SOURCES_DIST) $(vinagre_SOURCES) \ + $(am__vinagre_applet_SOURCES_DIST) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +DATA = $(header_DATA) $(server_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPLET_CFLAGS = @APPLET_CFLAGS@ +APPLET_LIBS = @APPLET_LIBS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVAHI_CFLAGS = @AVAHI_CFLAGS@ +AVAHI_LIBS = @AVAHI_LIBS@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +REBUILD = @REBUILD@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ +STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ +VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ +VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WARN_CFLAGS = @WARN_CFLAGS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = view +NULL = +INCLUDES = -DBINDIR=\"$(bindir)\" -DDATADIR=\"$(datadir)\" \ + -DPREFIX=\""$(prefix)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ + -DVINAGRE_DATADIR=\""$(datadir)/vinagre"\" \ + -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" $(VINAGRE_CFLAGS) \ + $(AVAHI_CFLAGS) $(NULL) $(am__append_3) +NOINST_H_FILES = \ + bacon-message-connection.h \ + vinagre-enums.h \ + vinagre-object-module.h \ + vinagre-plugin-info.h \ + vinagre-plugin-info-priv.h \ + vinagre-plugin-loader.h \ + vinagre-plugin-manager.h \ + vinagre-plugin-dialog.h \ + vinagre-plugins-engine.h \ + vinagre-window-private.h \ + vinagre-spinner.h \ + $(NULL) + +INST_H_FILES = \ + vinagre-app.h \ + vinagre-bacon.h \ + vinagre-bookmarks-entry.h \ + vinagre-bookmarks.h \ + vinagre-bookmarks-migration.h \ + vinagre-bookmarks-tree.h \ + vinagre-bookmarks-ui.h \ + vinagre-commands.h \ + vinagre-connect.h \ + vinagre-connection.h \ + vinagre-debug.h \ + vinagre-dirs.h \ + vinagre-fav.h \ + vinagre-notebook.h \ + vinagre-plugin.h \ + vinagre-plugin-loader.h \ + vinagre-prefs.h \ + vinagre-tab.h \ + vinagre-ui.h \ + vinagre-utils.h \ + vinagre-window.h \ + vinagre-dnd.h \ + $(NULL) + +headerdir = $(prefix)/include/vinagre-@VINAGRE_API_VERSION@/vinagre +header_DATA = $(INST_H_FILES) + +############################## +# The main library +############################## +noinst_LTLIBRARIES = libvinagre.la +libvinagre_la_SOURCES = bacon-message-connection.c vinagre-app.c \ + vinagre-bacon.c vinagre-bookmarks.c vinagre-bookmarks-entry.c \ + vinagre-bookmarks-migration.c vinagre-bookmarks-tree.c \ + vinagre-bookmarks-ui.c vinagre-commands.c vinagre-connect.c \ + vinagre-connection.c vinagre-debug.c vinagre-dirs.c \ + vinagre-enums.c vinagre-fav.c vinagre-notebook.c \ + vinagre-object-module.c vinagre-plugin.c vinagre-plugin-info.c \ + vinagre-plugin-dialog.c vinagre-plugin-loader.c \ + vinagre-plugin-manager.c vinagre-plugins-engine.c \ + vinagre-prefs.c vinagre-tab.c vinagre-utils.c vinagre-window.c \ + vinagre-spinner.c $(NOINST_H_FILES) $(INST_H_FILES) $(NULL) \ + $(am__append_1) $(am__append_5) +libvinagre_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" +# VINAGRE_LIBS must be the last to ensure correct order on some platforms +libvinagre_la_LIBADD = view/libview.la $(VINAGRE_LIBS) +vinagre_SOURCES = \ + vinagre-main.c + +vinagre_LDADD = libvinagre.la $(VINAGRE_LIBS) $(AVAHI_LIBS) \ + $(GTKVNC_LIBS) $(NULL) $(am__append_4) +vinagre_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" + +############################## +# Bonobo .server +############################## +@APPLET_TRUE@serverdir = \ +@APPLET_TRUE@ $(libdir)/bonobo/servers + +@APPLET_TRUE@server_in_files = \ +@APPLET_TRUE@ GNOME_VinagreApplet.server.in + +@APPLET_TRUE@server_DATA = \ +@APPLET_TRUE@ $(server_in_files:.server.in=.server) + +@APPLET_TRUE@vinagre_applet_CFLAGS = \ +@APPLET_TRUE@ $(APPLET_CFLAGS) \ +@APPLET_TRUE@ $(AVAHI_CFLAGS) \ +@APPLET_TRUE@ $(NULL) + +@APPLET_TRUE@vinagre_applet_SOURCES = vinagre-applet.c \ +@APPLET_TRUE@ vinagre-bookmarks.h vinagre-bookmarks.c \ +@APPLET_TRUE@ vinagre-bookmarks-ui.h vinagre-bookmarks-ui.c \ +@APPLET_TRUE@ vinagre-connection.h vinagre-connection.c \ +@APPLET_TRUE@ vinagre-utils.h vinagre-utils.c vinagre-enums.h \ +@APPLET_TRUE@ vinagre-enums.c vinagre-bookmarks-entry.h \ +@APPLET_TRUE@ vinagre-bookmarks-entry.c \ +@APPLET_TRUE@ vinagre-bookmarks-tree.h vinagre-bookmarks-tree.c \ +@APPLET_TRUE@ vinagre-bookmarks-migration.h \ +@APPLET_TRUE@ vinagre-bookmarks-migration.c \ +@APPLET_TRUE@ vinagre-plugins-engine.h vinagre-plugins-engine.c \ +@APPLET_TRUE@ vinagre-plugin.h vinagre-plugin.c \ +@APPLET_TRUE@ vinagre-plugin-loader.h vinagre-plugin-loader.c \ +@APPLET_TRUE@ vinagre-plugin-manager.h vinagre-plugin-manager.c \ +@APPLET_TRUE@ vinagre-plugin-dialog.h vinagre-plugin-dialog.c \ +@APPLET_TRUE@ vinagre-debug.h vinagre-debug.c \ +@APPLET_TRUE@ vinagre-plugin-info.h vinagre-plugin-info.c \ +@APPLET_TRUE@ vinagre-window.h vinagre-window.c \ +@APPLET_TRUE@ vinagre-commands.h vinagre-commands.c \ +@APPLET_TRUE@ vinagre-notebook.h vinagre-notebook.c \ +@APPLET_TRUE@ vinagre-tab.h vinagre-tab.c vinagre-prefs.h \ +@APPLET_TRUE@ vinagre-prefs.c vinagre-app.h vinagre-app.c \ +@APPLET_TRUE@ vinagre-object-module.h vinagre-object-module.c \ +@APPLET_TRUE@ vinagre-dirs.h vinagre-dirs.c vinagre-fav.h \ +@APPLET_TRUE@ vinagre-fav.c vinagre-connect.h vinagre-connect.c \ +@APPLET_TRUE@ vinagre-spinner.h vinagre-spinner.c $(NULL) \ +@APPLET_TRUE@ $(am__append_2) +@APPLET_TRUE@vinagre_applet_LDADD = \ +@APPLET_TRUE@ view/libview.la \ +@APPLET_TRUE@ $(APPLET_LIBS) \ +@APPLET_TRUE@ $(VINAGRE_LIBS) \ +@APPLET_TRUE@ $(AVAHI_LIBS) \ +@APPLET_TRUE@ $(NULL) + +@APPLET_TRUE@vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" + +############################## +# Autogenerated stuff +############################## +vinagre_enum_headers = \ + $(top_srcdir)/vinagre/vinagre-connection.h \ + $(NULL) + +BUILT_SOURCES = vinagre-enums.c vinagre-enums.h $(NULL) \ + $(am__append_6) +DISTCLEANFILES = \ + $(BUILT_SOURCES) \ + $(server_in_files) \ + $(server_DATA) \ + $(NULL) + +EXTRA_DIST = \ + GNOME_VinagreApplet.server.in.in \ + tube-handler.xml \ + $(NULL) + +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu vinagre/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu vinagre/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libvinagre.la: $(libvinagre_la_OBJECTS) $(libvinagre_la_DEPENDENCIES) + $(AM_V_CCLD)$(libvinagre_la_LINK) $(libvinagre_la_OBJECTS) $(libvinagre_la_LIBADD) $(LIBS) +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-libexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + +clean-libexecPROGRAMS: + @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +vinagre$(EXEEXT): $(vinagre_OBJECTS) $(vinagre_DEPENDENCIES) + @rm -f vinagre$(EXEEXT) + $(AM_V_CCLD)$(vinagre_LINK) $(vinagre_OBJECTS) $(vinagre_LDADD) $(LIBS) +vinagre-applet$(EXEEXT): $(vinagre_applet_OBJECTS) $(vinagre_applet_DEPENDENCIES) + @rm -f vinagre-applet$(EXEEXT) + $(AM_V_CCLD)$(vinagre_applet_LINK) $(vinagre_applet_OBJECTS) $(vinagre_applet_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bacon-message-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-app.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bacon.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks-entry.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks-migration.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks-tree.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks-ui.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-bookmarks.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-commands.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-connect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-debug.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-dirs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-enums.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-fav.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-mdns.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-notebook.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-object-module.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-plugin-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-plugin-info.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-plugin-loader.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-plugin-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-plugin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-plugins-engine.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-prefs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-spinner.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-tab.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-tube-handler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-tubes-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre-window.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-app.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-applet.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-bookmarks-ui.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-bookmarks.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-commands.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-connect.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-connection.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-debug.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-dirs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-enums.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-fav.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-mdns.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-notebook.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-object-module.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-plugin-dialog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-plugin-info.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-plugin-loader.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-plugin-manager.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-plugin.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-plugins-engine.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-prefs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-spinner.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-tab.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vinagre_applet-vinagre-window.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +vinagre_applet-vinagre-applet.o: vinagre-applet.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-applet.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-applet.Tpo -c -o vinagre_applet-vinagre-applet.o `test -f 'vinagre-applet.c' || echo '$(srcdir)/'`vinagre-applet.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-applet.Tpo $(DEPDIR)/vinagre_applet-vinagre-applet.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-applet.c' object='vinagre_applet-vinagre-applet.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-applet.o `test -f 'vinagre-applet.c' || echo '$(srcdir)/'`vinagre-applet.c + +vinagre_applet-vinagre-applet.obj: vinagre-applet.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-applet.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-applet.Tpo -c -o vinagre_applet-vinagre-applet.obj `if test -f 'vinagre-applet.c'; then $(CYGPATH_W) 'vinagre-applet.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-applet.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-applet.Tpo $(DEPDIR)/vinagre_applet-vinagre-applet.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-applet.c' object='vinagre_applet-vinagre-applet.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-applet.obj `if test -f 'vinagre-applet.c'; then $(CYGPATH_W) 'vinagre-applet.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-applet.c'; fi` + +vinagre_applet-vinagre-bookmarks.o: vinagre-bookmarks.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Tpo -c -o vinagre_applet-vinagre-bookmarks.o `test -f 'vinagre-bookmarks.c' || echo '$(srcdir)/'`vinagre-bookmarks.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks.c' object='vinagre_applet-vinagre-bookmarks.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks.o `test -f 'vinagre-bookmarks.c' || echo '$(srcdir)/'`vinagre-bookmarks.c + +vinagre_applet-vinagre-bookmarks.obj: vinagre-bookmarks.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Tpo -c -o vinagre_applet-vinagre-bookmarks.obj `if test -f 'vinagre-bookmarks.c'; then $(CYGPATH_W) 'vinagre-bookmarks.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks.c' object='vinagre_applet-vinagre-bookmarks.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks.obj `if test -f 'vinagre-bookmarks.c'; then $(CYGPATH_W) 'vinagre-bookmarks.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks.c'; fi` + +vinagre_applet-vinagre-bookmarks-ui.o: vinagre-bookmarks-ui.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-ui.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-ui.Tpo -c -o vinagre_applet-vinagre-bookmarks-ui.o `test -f 'vinagre-bookmarks-ui.c' || echo '$(srcdir)/'`vinagre-bookmarks-ui.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks-ui.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-ui.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-ui.c' object='vinagre_applet-vinagre-bookmarks-ui.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-ui.o `test -f 'vinagre-bookmarks-ui.c' || echo '$(srcdir)/'`vinagre-bookmarks-ui.c + +vinagre_applet-vinagre-bookmarks-ui.obj: vinagre-bookmarks-ui.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-ui.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-ui.Tpo -c -o vinagre_applet-vinagre-bookmarks-ui.obj `if test -f 'vinagre-bookmarks-ui.c'; then $(CYGPATH_W) 'vinagre-bookmarks-ui.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-ui.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks-ui.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-ui.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-ui.c' object='vinagre_applet-vinagre-bookmarks-ui.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-ui.obj `if test -f 'vinagre-bookmarks-ui.c'; then $(CYGPATH_W) 'vinagre-bookmarks-ui.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-ui.c'; fi` + +vinagre_applet-vinagre-connection.o: vinagre-connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-connection.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-connection.Tpo -c -o vinagre_applet-vinagre-connection.o `test -f 'vinagre-connection.c' || echo '$(srcdir)/'`vinagre-connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-connection.Tpo $(DEPDIR)/vinagre_applet-vinagre-connection.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-connection.c' object='vinagre_applet-vinagre-connection.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-connection.o `test -f 'vinagre-connection.c' || echo '$(srcdir)/'`vinagre-connection.c + +vinagre_applet-vinagre-connection.obj: vinagre-connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-connection.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-connection.Tpo -c -o vinagre_applet-vinagre-connection.obj `if test -f 'vinagre-connection.c'; then $(CYGPATH_W) 'vinagre-connection.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-connection.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-connection.Tpo $(DEPDIR)/vinagre_applet-vinagre-connection.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-connection.c' object='vinagre_applet-vinagre-connection.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-connection.obj `if test -f 'vinagre-connection.c'; then $(CYGPATH_W) 'vinagre-connection.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-connection.c'; fi` + +vinagre_applet-vinagre-utils.o: vinagre-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-utils.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-utils.Tpo -c -o vinagre_applet-vinagre-utils.o `test -f 'vinagre-utils.c' || echo '$(srcdir)/'`vinagre-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-utils.Tpo $(DEPDIR)/vinagre_applet-vinagre-utils.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-utils.c' object='vinagre_applet-vinagre-utils.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-utils.o `test -f 'vinagre-utils.c' || echo '$(srcdir)/'`vinagre-utils.c + +vinagre_applet-vinagre-utils.obj: vinagre-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-utils.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-utils.Tpo -c -o vinagre_applet-vinagre-utils.obj `if test -f 'vinagre-utils.c'; then $(CYGPATH_W) 'vinagre-utils.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-utils.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-utils.Tpo $(DEPDIR)/vinagre_applet-vinagre-utils.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-utils.c' object='vinagre_applet-vinagre-utils.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-utils.obj `if test -f 'vinagre-utils.c'; then $(CYGPATH_W) 'vinagre-utils.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-utils.c'; fi` + +vinagre_applet-vinagre-enums.o: vinagre-enums.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-enums.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-enums.Tpo -c -o vinagre_applet-vinagre-enums.o `test -f 'vinagre-enums.c' || echo '$(srcdir)/'`vinagre-enums.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-enums.Tpo $(DEPDIR)/vinagre_applet-vinagre-enums.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-enums.c' object='vinagre_applet-vinagre-enums.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-enums.o `test -f 'vinagre-enums.c' || echo '$(srcdir)/'`vinagre-enums.c + +vinagre_applet-vinagre-enums.obj: vinagre-enums.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-enums.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-enums.Tpo -c -o vinagre_applet-vinagre-enums.obj `if test -f 'vinagre-enums.c'; then $(CYGPATH_W) 'vinagre-enums.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-enums.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-enums.Tpo $(DEPDIR)/vinagre_applet-vinagre-enums.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-enums.c' object='vinagre_applet-vinagre-enums.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-enums.obj `if test -f 'vinagre-enums.c'; then $(CYGPATH_W) 'vinagre-enums.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-enums.c'; fi` + +vinagre_applet-vinagre-bookmarks-entry.o: vinagre-bookmarks-entry.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-entry.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Tpo -c -o vinagre_applet-vinagre-bookmarks-entry.o `test -f 'vinagre-bookmarks-entry.c' || echo '$(srcdir)/'`vinagre-bookmarks-entry.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-entry.c' object='vinagre_applet-vinagre-bookmarks-entry.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-entry.o `test -f 'vinagre-bookmarks-entry.c' || echo '$(srcdir)/'`vinagre-bookmarks-entry.c + +vinagre_applet-vinagre-bookmarks-entry.obj: vinagre-bookmarks-entry.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-entry.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Tpo -c -o vinagre_applet-vinagre-bookmarks-entry.obj `if test -f 'vinagre-bookmarks-entry.c'; then $(CYGPATH_W) 'vinagre-bookmarks-entry.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-entry.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-entry.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-entry.c' object='vinagre_applet-vinagre-bookmarks-entry.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-entry.obj `if test -f 'vinagre-bookmarks-entry.c'; then $(CYGPATH_W) 'vinagre-bookmarks-entry.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-entry.c'; fi` + +vinagre_applet-vinagre-bookmarks-tree.o: vinagre-bookmarks-tree.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-tree.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Tpo -c -o vinagre_applet-vinagre-bookmarks-tree.o `test -f 'vinagre-bookmarks-tree.c' || echo '$(srcdir)/'`vinagre-bookmarks-tree.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-tree.c' object='vinagre_applet-vinagre-bookmarks-tree.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-tree.o `test -f 'vinagre-bookmarks-tree.c' || echo '$(srcdir)/'`vinagre-bookmarks-tree.c + +vinagre_applet-vinagre-bookmarks-tree.obj: vinagre-bookmarks-tree.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-tree.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Tpo -c -o vinagre_applet-vinagre-bookmarks-tree.obj `if test -f 'vinagre-bookmarks-tree.c'; then $(CYGPATH_W) 'vinagre-bookmarks-tree.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-tree.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-tree.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-tree.c' object='vinagre_applet-vinagre-bookmarks-tree.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-tree.obj `if test -f 'vinagre-bookmarks-tree.c'; then $(CYGPATH_W) 'vinagre-bookmarks-tree.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-tree.c'; fi` + +vinagre_applet-vinagre-bookmarks-migration.o: vinagre-bookmarks-migration.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-migration.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Tpo -c -o vinagre_applet-vinagre-bookmarks-migration.o `test -f 'vinagre-bookmarks-migration.c' || echo '$(srcdir)/'`vinagre-bookmarks-migration.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-migration.c' object='vinagre_applet-vinagre-bookmarks-migration.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-migration.o `test -f 'vinagre-bookmarks-migration.c' || echo '$(srcdir)/'`vinagre-bookmarks-migration.c + +vinagre_applet-vinagre-bookmarks-migration.obj: vinagre-bookmarks-migration.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-bookmarks-migration.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Tpo -c -o vinagre_applet-vinagre-bookmarks-migration.obj `if test -f 'vinagre-bookmarks-migration.c'; then $(CYGPATH_W) 'vinagre-bookmarks-migration.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-migration.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Tpo $(DEPDIR)/vinagre_applet-vinagre-bookmarks-migration.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-bookmarks-migration.c' object='vinagre_applet-vinagre-bookmarks-migration.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-bookmarks-migration.obj `if test -f 'vinagre-bookmarks-migration.c'; then $(CYGPATH_W) 'vinagre-bookmarks-migration.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-bookmarks-migration.c'; fi` + +vinagre_applet-vinagre-plugins-engine.o: vinagre-plugins-engine.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugins-engine.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugins-engine.Tpo -c -o vinagre_applet-vinagre-plugins-engine.o `test -f 'vinagre-plugins-engine.c' || echo '$(srcdir)/'`vinagre-plugins-engine.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugins-engine.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugins-engine.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugins-engine.c' object='vinagre_applet-vinagre-plugins-engine.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugins-engine.o `test -f 'vinagre-plugins-engine.c' || echo '$(srcdir)/'`vinagre-plugins-engine.c + +vinagre_applet-vinagre-plugins-engine.obj: vinagre-plugins-engine.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugins-engine.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugins-engine.Tpo -c -o vinagre_applet-vinagre-plugins-engine.obj `if test -f 'vinagre-plugins-engine.c'; then $(CYGPATH_W) 'vinagre-plugins-engine.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugins-engine.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugins-engine.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugins-engine.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugins-engine.c' object='vinagre_applet-vinagre-plugins-engine.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugins-engine.obj `if test -f 'vinagre-plugins-engine.c'; then $(CYGPATH_W) 'vinagre-plugins-engine.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugins-engine.c'; fi` + +vinagre_applet-vinagre-plugin.o: vinagre-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin.Tpo -c -o vinagre_applet-vinagre-plugin.o `test -f 'vinagre-plugin.c' || echo '$(srcdir)/'`vinagre-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin.c' object='vinagre_applet-vinagre-plugin.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin.o `test -f 'vinagre-plugin.c' || echo '$(srcdir)/'`vinagre-plugin.c + +vinagre_applet-vinagre-plugin.obj: vinagre-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin.Tpo -c -o vinagre_applet-vinagre-plugin.obj `if test -f 'vinagre-plugin.c'; then $(CYGPATH_W) 'vinagre-plugin.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin.c' object='vinagre_applet-vinagre-plugin.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin.obj `if test -f 'vinagre-plugin.c'; then $(CYGPATH_W) 'vinagre-plugin.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin.c'; fi` + +vinagre_applet-vinagre-plugin-loader.o: vinagre-plugin-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin-loader.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin-loader.Tpo -c -o vinagre_applet-vinagre-plugin-loader.o `test -f 'vinagre-plugin-loader.c' || echo '$(srcdir)/'`vinagre-plugin-loader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin-loader.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin-loader.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin-loader.c' object='vinagre_applet-vinagre-plugin-loader.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin-loader.o `test -f 'vinagre-plugin-loader.c' || echo '$(srcdir)/'`vinagre-plugin-loader.c + +vinagre_applet-vinagre-plugin-loader.obj: vinagre-plugin-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin-loader.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin-loader.Tpo -c -o vinagre_applet-vinagre-plugin-loader.obj `if test -f 'vinagre-plugin-loader.c'; then $(CYGPATH_W) 'vinagre-plugin-loader.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin-loader.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin-loader.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin-loader.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin-loader.c' object='vinagre_applet-vinagre-plugin-loader.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin-loader.obj `if test -f 'vinagre-plugin-loader.c'; then $(CYGPATH_W) 'vinagre-plugin-loader.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin-loader.c'; fi` + +vinagre_applet-vinagre-plugin-manager.o: vinagre-plugin-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin-manager.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin-manager.Tpo -c -o vinagre_applet-vinagre-plugin-manager.o `test -f 'vinagre-plugin-manager.c' || echo '$(srcdir)/'`vinagre-plugin-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin-manager.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin-manager.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin-manager.c' object='vinagre_applet-vinagre-plugin-manager.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin-manager.o `test -f 'vinagre-plugin-manager.c' || echo '$(srcdir)/'`vinagre-plugin-manager.c + +vinagre_applet-vinagre-plugin-manager.obj: vinagre-plugin-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin-manager.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin-manager.Tpo -c -o vinagre_applet-vinagre-plugin-manager.obj `if test -f 'vinagre-plugin-manager.c'; then $(CYGPATH_W) 'vinagre-plugin-manager.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin-manager.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin-manager.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin-manager.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin-manager.c' object='vinagre_applet-vinagre-plugin-manager.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin-manager.obj `if test -f 'vinagre-plugin-manager.c'; then $(CYGPATH_W) 'vinagre-plugin-manager.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin-manager.c'; fi` + +vinagre_applet-vinagre-plugin-dialog.o: vinagre-plugin-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin-dialog.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin-dialog.Tpo -c -o vinagre_applet-vinagre-plugin-dialog.o `test -f 'vinagre-plugin-dialog.c' || echo '$(srcdir)/'`vinagre-plugin-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin-dialog.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin-dialog.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin-dialog.c' object='vinagre_applet-vinagre-plugin-dialog.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin-dialog.o `test -f 'vinagre-plugin-dialog.c' || echo '$(srcdir)/'`vinagre-plugin-dialog.c + +vinagre_applet-vinagre-plugin-dialog.obj: vinagre-plugin-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin-dialog.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin-dialog.Tpo -c -o vinagre_applet-vinagre-plugin-dialog.obj `if test -f 'vinagre-plugin-dialog.c'; then $(CYGPATH_W) 'vinagre-plugin-dialog.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin-dialog.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin-dialog.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin-dialog.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin-dialog.c' object='vinagre_applet-vinagre-plugin-dialog.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin-dialog.obj `if test -f 'vinagre-plugin-dialog.c'; then $(CYGPATH_W) 'vinagre-plugin-dialog.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin-dialog.c'; fi` + +vinagre_applet-vinagre-debug.o: vinagre-debug.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-debug.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-debug.Tpo -c -o vinagre_applet-vinagre-debug.o `test -f 'vinagre-debug.c' || echo '$(srcdir)/'`vinagre-debug.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-debug.Tpo $(DEPDIR)/vinagre_applet-vinagre-debug.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-debug.c' object='vinagre_applet-vinagre-debug.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-debug.o `test -f 'vinagre-debug.c' || echo '$(srcdir)/'`vinagre-debug.c + +vinagre_applet-vinagre-debug.obj: vinagre-debug.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-debug.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-debug.Tpo -c -o vinagre_applet-vinagre-debug.obj `if test -f 'vinagre-debug.c'; then $(CYGPATH_W) 'vinagre-debug.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-debug.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-debug.Tpo $(DEPDIR)/vinagre_applet-vinagre-debug.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-debug.c' object='vinagre_applet-vinagre-debug.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-debug.obj `if test -f 'vinagre-debug.c'; then $(CYGPATH_W) 'vinagre-debug.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-debug.c'; fi` + +vinagre_applet-vinagre-plugin-info.o: vinagre-plugin-info.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin-info.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin-info.Tpo -c -o vinagre_applet-vinagre-plugin-info.o `test -f 'vinagre-plugin-info.c' || echo '$(srcdir)/'`vinagre-plugin-info.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin-info.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin-info.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin-info.c' object='vinagre_applet-vinagre-plugin-info.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin-info.o `test -f 'vinagre-plugin-info.c' || echo '$(srcdir)/'`vinagre-plugin-info.c + +vinagre_applet-vinagre-plugin-info.obj: vinagre-plugin-info.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-plugin-info.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-plugin-info.Tpo -c -o vinagre_applet-vinagre-plugin-info.obj `if test -f 'vinagre-plugin-info.c'; then $(CYGPATH_W) 'vinagre-plugin-info.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin-info.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-plugin-info.Tpo $(DEPDIR)/vinagre_applet-vinagre-plugin-info.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-plugin-info.c' object='vinagre_applet-vinagre-plugin-info.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-plugin-info.obj `if test -f 'vinagre-plugin-info.c'; then $(CYGPATH_W) 'vinagre-plugin-info.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-plugin-info.c'; fi` + +vinagre_applet-vinagre-window.o: vinagre-window.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-window.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-window.Tpo -c -o vinagre_applet-vinagre-window.o `test -f 'vinagre-window.c' || echo '$(srcdir)/'`vinagre-window.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-window.Tpo $(DEPDIR)/vinagre_applet-vinagre-window.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-window.c' object='vinagre_applet-vinagre-window.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-window.o `test -f 'vinagre-window.c' || echo '$(srcdir)/'`vinagre-window.c + +vinagre_applet-vinagre-window.obj: vinagre-window.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-window.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-window.Tpo -c -o vinagre_applet-vinagre-window.obj `if test -f 'vinagre-window.c'; then $(CYGPATH_W) 'vinagre-window.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-window.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-window.Tpo $(DEPDIR)/vinagre_applet-vinagre-window.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-window.c' object='vinagre_applet-vinagre-window.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-window.obj `if test -f 'vinagre-window.c'; then $(CYGPATH_W) 'vinagre-window.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-window.c'; fi` + +vinagre_applet-vinagre-commands.o: vinagre-commands.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-commands.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-commands.Tpo -c -o vinagre_applet-vinagre-commands.o `test -f 'vinagre-commands.c' || echo '$(srcdir)/'`vinagre-commands.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-commands.Tpo $(DEPDIR)/vinagre_applet-vinagre-commands.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-commands.c' object='vinagre_applet-vinagre-commands.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-commands.o `test -f 'vinagre-commands.c' || echo '$(srcdir)/'`vinagre-commands.c + +vinagre_applet-vinagre-commands.obj: vinagre-commands.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-commands.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-commands.Tpo -c -o vinagre_applet-vinagre-commands.obj `if test -f 'vinagre-commands.c'; then $(CYGPATH_W) 'vinagre-commands.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-commands.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-commands.Tpo $(DEPDIR)/vinagre_applet-vinagre-commands.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-commands.c' object='vinagre_applet-vinagre-commands.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-commands.obj `if test -f 'vinagre-commands.c'; then $(CYGPATH_W) 'vinagre-commands.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-commands.c'; fi` + +vinagre_applet-vinagre-notebook.o: vinagre-notebook.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-notebook.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-notebook.Tpo -c -o vinagre_applet-vinagre-notebook.o `test -f 'vinagre-notebook.c' || echo '$(srcdir)/'`vinagre-notebook.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-notebook.Tpo $(DEPDIR)/vinagre_applet-vinagre-notebook.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-notebook.c' object='vinagre_applet-vinagre-notebook.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-notebook.o `test -f 'vinagre-notebook.c' || echo '$(srcdir)/'`vinagre-notebook.c + +vinagre_applet-vinagre-notebook.obj: vinagre-notebook.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-notebook.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-notebook.Tpo -c -o vinagre_applet-vinagre-notebook.obj `if test -f 'vinagre-notebook.c'; then $(CYGPATH_W) 'vinagre-notebook.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-notebook.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-notebook.Tpo $(DEPDIR)/vinagre_applet-vinagre-notebook.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-notebook.c' object='vinagre_applet-vinagre-notebook.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-notebook.obj `if test -f 'vinagre-notebook.c'; then $(CYGPATH_W) 'vinagre-notebook.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-notebook.c'; fi` + +vinagre_applet-vinagre-tab.o: vinagre-tab.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-tab.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-tab.Tpo -c -o vinagre_applet-vinagre-tab.o `test -f 'vinagre-tab.c' || echo '$(srcdir)/'`vinagre-tab.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-tab.Tpo $(DEPDIR)/vinagre_applet-vinagre-tab.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-tab.c' object='vinagre_applet-vinagre-tab.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-tab.o `test -f 'vinagre-tab.c' || echo '$(srcdir)/'`vinagre-tab.c + +vinagre_applet-vinagre-tab.obj: vinagre-tab.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-tab.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-tab.Tpo -c -o vinagre_applet-vinagre-tab.obj `if test -f 'vinagre-tab.c'; then $(CYGPATH_W) 'vinagre-tab.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-tab.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-tab.Tpo $(DEPDIR)/vinagre_applet-vinagre-tab.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-tab.c' object='vinagre_applet-vinagre-tab.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-tab.obj `if test -f 'vinagre-tab.c'; then $(CYGPATH_W) 'vinagre-tab.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-tab.c'; fi` + +vinagre_applet-vinagre-prefs.o: vinagre-prefs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-prefs.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-prefs.Tpo -c -o vinagre_applet-vinagre-prefs.o `test -f 'vinagre-prefs.c' || echo '$(srcdir)/'`vinagre-prefs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-prefs.Tpo $(DEPDIR)/vinagre_applet-vinagre-prefs.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-prefs.c' object='vinagre_applet-vinagre-prefs.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-prefs.o `test -f 'vinagre-prefs.c' || echo '$(srcdir)/'`vinagre-prefs.c + +vinagre_applet-vinagre-prefs.obj: vinagre-prefs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-prefs.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-prefs.Tpo -c -o vinagre_applet-vinagre-prefs.obj `if test -f 'vinagre-prefs.c'; then $(CYGPATH_W) 'vinagre-prefs.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-prefs.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-prefs.Tpo $(DEPDIR)/vinagre_applet-vinagre-prefs.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-prefs.c' object='vinagre_applet-vinagre-prefs.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-prefs.obj `if test -f 'vinagre-prefs.c'; then $(CYGPATH_W) 'vinagre-prefs.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-prefs.c'; fi` + +vinagre_applet-vinagre-app.o: vinagre-app.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-app.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-app.Tpo -c -o vinagre_applet-vinagre-app.o `test -f 'vinagre-app.c' || echo '$(srcdir)/'`vinagre-app.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-app.Tpo $(DEPDIR)/vinagre_applet-vinagre-app.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-app.c' object='vinagre_applet-vinagre-app.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-app.o `test -f 'vinagre-app.c' || echo '$(srcdir)/'`vinagre-app.c + +vinagre_applet-vinagre-app.obj: vinagre-app.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-app.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-app.Tpo -c -o vinagre_applet-vinagre-app.obj `if test -f 'vinagre-app.c'; then $(CYGPATH_W) 'vinagre-app.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-app.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-app.Tpo $(DEPDIR)/vinagre_applet-vinagre-app.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-app.c' object='vinagre_applet-vinagre-app.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-app.obj `if test -f 'vinagre-app.c'; then $(CYGPATH_W) 'vinagre-app.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-app.c'; fi` + +vinagre_applet-vinagre-object-module.o: vinagre-object-module.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-object-module.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-object-module.Tpo -c -o vinagre_applet-vinagre-object-module.o `test -f 'vinagre-object-module.c' || echo '$(srcdir)/'`vinagre-object-module.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-object-module.Tpo $(DEPDIR)/vinagre_applet-vinagre-object-module.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-object-module.c' object='vinagre_applet-vinagre-object-module.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-object-module.o `test -f 'vinagre-object-module.c' || echo '$(srcdir)/'`vinagre-object-module.c + +vinagre_applet-vinagre-object-module.obj: vinagre-object-module.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-object-module.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-object-module.Tpo -c -o vinagre_applet-vinagre-object-module.obj `if test -f 'vinagre-object-module.c'; then $(CYGPATH_W) 'vinagre-object-module.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-object-module.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-object-module.Tpo $(DEPDIR)/vinagre_applet-vinagre-object-module.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-object-module.c' object='vinagre_applet-vinagre-object-module.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-object-module.obj `if test -f 'vinagre-object-module.c'; then $(CYGPATH_W) 'vinagre-object-module.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-object-module.c'; fi` + +vinagre_applet-vinagre-dirs.o: vinagre-dirs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-dirs.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-dirs.Tpo -c -o vinagre_applet-vinagre-dirs.o `test -f 'vinagre-dirs.c' || echo '$(srcdir)/'`vinagre-dirs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-dirs.Tpo $(DEPDIR)/vinagre_applet-vinagre-dirs.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-dirs.c' object='vinagre_applet-vinagre-dirs.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-dirs.o `test -f 'vinagre-dirs.c' || echo '$(srcdir)/'`vinagre-dirs.c + +vinagre_applet-vinagre-dirs.obj: vinagre-dirs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-dirs.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-dirs.Tpo -c -o vinagre_applet-vinagre-dirs.obj `if test -f 'vinagre-dirs.c'; then $(CYGPATH_W) 'vinagre-dirs.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-dirs.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-dirs.Tpo $(DEPDIR)/vinagre_applet-vinagre-dirs.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-dirs.c' object='vinagre_applet-vinagre-dirs.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-dirs.obj `if test -f 'vinagre-dirs.c'; then $(CYGPATH_W) 'vinagre-dirs.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-dirs.c'; fi` + +vinagre_applet-vinagre-fav.o: vinagre-fav.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-fav.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-fav.Tpo -c -o vinagre_applet-vinagre-fav.o `test -f 'vinagre-fav.c' || echo '$(srcdir)/'`vinagre-fav.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-fav.Tpo $(DEPDIR)/vinagre_applet-vinagre-fav.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-fav.c' object='vinagre_applet-vinagre-fav.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-fav.o `test -f 'vinagre-fav.c' || echo '$(srcdir)/'`vinagre-fav.c + +vinagre_applet-vinagre-fav.obj: vinagre-fav.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-fav.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-fav.Tpo -c -o vinagre_applet-vinagre-fav.obj `if test -f 'vinagre-fav.c'; then $(CYGPATH_W) 'vinagre-fav.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-fav.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-fav.Tpo $(DEPDIR)/vinagre_applet-vinagre-fav.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-fav.c' object='vinagre_applet-vinagre-fav.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-fav.obj `if test -f 'vinagre-fav.c'; then $(CYGPATH_W) 'vinagre-fav.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-fav.c'; fi` + +vinagre_applet-vinagre-connect.o: vinagre-connect.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-connect.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-connect.Tpo -c -o vinagre_applet-vinagre-connect.o `test -f 'vinagre-connect.c' || echo '$(srcdir)/'`vinagre-connect.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-connect.Tpo $(DEPDIR)/vinagre_applet-vinagre-connect.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-connect.c' object='vinagre_applet-vinagre-connect.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-connect.o `test -f 'vinagre-connect.c' || echo '$(srcdir)/'`vinagre-connect.c + +vinagre_applet-vinagre-connect.obj: vinagre-connect.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-connect.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-connect.Tpo -c -o vinagre_applet-vinagre-connect.obj `if test -f 'vinagre-connect.c'; then $(CYGPATH_W) 'vinagre-connect.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-connect.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-connect.Tpo $(DEPDIR)/vinagre_applet-vinagre-connect.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-connect.c' object='vinagre_applet-vinagre-connect.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-connect.obj `if test -f 'vinagre-connect.c'; then $(CYGPATH_W) 'vinagre-connect.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-connect.c'; fi` + +vinagre_applet-vinagre-spinner.o: vinagre-spinner.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-spinner.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-spinner.Tpo -c -o vinagre_applet-vinagre-spinner.o `test -f 'vinagre-spinner.c' || echo '$(srcdir)/'`vinagre-spinner.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-spinner.Tpo $(DEPDIR)/vinagre_applet-vinagre-spinner.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-spinner.c' object='vinagre_applet-vinagre-spinner.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-spinner.o `test -f 'vinagre-spinner.c' || echo '$(srcdir)/'`vinagre-spinner.c + +vinagre_applet-vinagre-spinner.obj: vinagre-spinner.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-spinner.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-spinner.Tpo -c -o vinagre_applet-vinagre-spinner.obj `if test -f 'vinagre-spinner.c'; then $(CYGPATH_W) 'vinagre-spinner.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-spinner.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-spinner.Tpo $(DEPDIR)/vinagre_applet-vinagre-spinner.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-spinner.c' object='vinagre_applet-vinagre-spinner.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-spinner.obj `if test -f 'vinagre-spinner.c'; then $(CYGPATH_W) 'vinagre-spinner.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-spinner.c'; fi` + +vinagre_applet-vinagre-mdns.o: vinagre-mdns.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-mdns.o -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-mdns.Tpo -c -o vinagre_applet-vinagre-mdns.o `test -f 'vinagre-mdns.c' || echo '$(srcdir)/'`vinagre-mdns.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-mdns.Tpo $(DEPDIR)/vinagre_applet-vinagre-mdns.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-mdns.c' object='vinagre_applet-vinagre-mdns.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-mdns.o `test -f 'vinagre-mdns.c' || echo '$(srcdir)/'`vinagre-mdns.c + +vinagre_applet-vinagre-mdns.obj: vinagre-mdns.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -MT vinagre_applet-vinagre-mdns.obj -MD -MP -MF $(DEPDIR)/vinagre_applet-vinagre-mdns.Tpo -c -o vinagre_applet-vinagre-mdns.obj `if test -f 'vinagre-mdns.c'; then $(CYGPATH_W) 'vinagre-mdns.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-mdns.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/vinagre_applet-vinagre-mdns.Tpo $(DEPDIR)/vinagre_applet-vinagre-mdns.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='vinagre-mdns.c' object='vinagre_applet-vinagre-mdns.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vinagre_applet_CFLAGS) $(CFLAGS) -c -o vinagre_applet-vinagre-mdns.obj `if test -f 'vinagre-mdns.c'; then $(CYGPATH_W) 'vinagre-mdns.c'; else $(CYGPATH_W) '$(srcdir)/vinagre-mdns.c'; fi` + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-headerDATA: $(header_DATA) + @$(NORMAL_INSTALL) + test -z "$(headerdir)" || $(MKDIR_P) "$(DESTDIR)$(headerdir)" + @list='$(header_DATA)'; test -n "$(headerdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(headerdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(headerdir)" || exit $$?; \ + done + +uninstall-headerDATA: + @$(NORMAL_UNINSTALL) + @list='$(header_DATA)'; test -n "$(headerdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(headerdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(headerdir)" && rm -f $$files +install-serverDATA: $(server_DATA) + @$(NORMAL_INSTALL) + test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)" + @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(serverdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(serverdir)" || exit $$?; \ + done + +uninstall-serverDATA: + @$(NORMAL_UNINSTALL) + @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(serverdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(serverdir)" && rm -f $$files + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook +check-am: all-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(headerdir)" "$(DESTDIR)$(serverdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-recursive + +clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ + clean-libtool clean-noinstLTLIBRARIES mostlyclean-am + +distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: install-headerDATA install-serverDATA + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: install-binPROGRAMS install-libexecPROGRAMS + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-headerDATA \ + uninstall-libexecPROGRAMS uninstall-serverDATA + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ + ctags-recursive install install-am install-strip \ + tags-recursive + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libexecPROGRAMS clean-libtool \ + clean-noinstLTLIBRARIES ctags ctags-recursive dist-hook \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-headerDATA install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-serverDATA install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-headerDATA \ + uninstall-libexecPROGRAMS uninstall-serverDATA + + +@APPLET_TRUE@$(server_in_files): $(server_in_files:.server.in=.server.in.in) +@APPLET_TRUE@ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ + +@APPLET_TRUE@@INTLTOOL_SERVER_RULE@ + +vinagre-enums.c: @REBUILD@ $(vinagre_enum_headers) + glib-mkenums --fhead "#include \n" \ + --fhead "#include \"vinagre-enums.h\"\n\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --fprod "\n#include \"@filename@\"\n" \ + --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n};\n\n" \ + --vtail "GType\n@enum_name@_get_type (void)\n{\n" \ + --vtail " static GType type = 0;\n\n" \ + --vtail " if (!type)\n" \ + --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ + --vtail " return type;\n}\n\n" \ + $(vinagre_enum_headers) > $@ + +vinagre-enums.h: @REBUILD@ $(vinagre_enum_headers) + glib-mkenums --fhead "#ifndef __VINAGRE_ENUMS_H__\n" \ + --fhead "#define __VINAGRE_ENUMS_H__ 1\n\n" \ + --fhead "G_BEGIN_DECLS\n\n" \ + --ftail "G_END_DECLS\n\n" \ + --ftail "#endif /* __VINAGRE_ENUMS_H__ */\n" \ + --fprod "\n/* --- @filename@ --- */" \ + --eprod "#define VINAGRE_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ + --eprod "GType @enum_name@_get_type (void);\n" \ + $(vinagre_enum_headers) > $@ + +@TELEPATHY_TRUE@dbus-interface-glue.h: tube-handler.xml +@TELEPATHY_TRUE@ dbus-binding-tool --prefix=vinagre_tubes_manager --mode=glib-server $< > dbus-interface-glue.h + +dist-hook: + cd $(distdir) ; rm -f $(DISTCLEANFILES) + +$(vinagre_OBJECTS): $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru vinagre-2.26.1/vinagre/tube-handler.xml vinagre-2.29.1/vinagre/tube-handler.xml --- vinagre-2.26.1/vinagre/tube-handler.xml 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/tube-handler.xml 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,57 @@ + + + Copyright (C) 2008 Collabora Limited + +

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 +Library 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.

+ + + + + + + The bus name of the connection and channel + + + + + The object-path of the connection that owns the channel + + + + + The object-path of the tubes channel + + + + The type of the handle that the channel communicates + with, or 0 if there is no associated handle + + + The handle that the channel communicates with, + or 0 if there is no associated handle + + + Called when a tube handler should handle a new tube within a tubes channel. + + + + +

An interface exported by client applications which are able to + handle incoming tubes.

+ + + + + diff -Nru vinagre-2.26.1/vinagre/view/autoDrawer.c vinagre-2.29.1/vinagre/view/autoDrawer.c --- vinagre-2.26.1/vinagre/view/autoDrawer.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/view/autoDrawer.c 2009-08-13 15:53:38.000000000 +0100 @@ -0,0 +1,889 @@ +/* ************************************************************************* + * Copyright (c) 2005 VMware Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * *************************************************************************/ + +/* + * autoDrawer.c - + * + * Subclass of ViewDrawer that encapsulates the behaviour typically required + * when using the drawer to implement a menu/toolbar that auto-opens when + * moused-over and auto-closes when the mouse leaves. + */ + + +#include "autoDrawer.h" + + +struct _ViewAutoDrawerPrivate +{ + gboolean active; + gboolean pinned; + gboolean inputUngrabbed; + + gboolean opened; + + gboolean fill; + gint offset; + + guint delayConnection; + guint delayValue; + guint overlapPixels; + guint noOverlapPixels; + + GtkWidget *over; + GtkWidget *evBox; +}; + +#define VIEW_AUTODRAWER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), VIEW_TYPE_AUTODRAWER, ViewAutoDrawerPrivate)) + +/* The unaltered parent class. */ +static ViewDrawerClass *parentClass; + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerEnforce -- + * + * Enforce an AutoDrawer's goal now. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewAutoDrawerEnforce(ViewAutoDrawer *that, // IN + gboolean animate) // IN +{ + double fraction; + ViewAutoDrawerPrivate *priv = that->priv; + + if (!priv->active) { + ViewOvBox_SetMin(VIEW_OV_BOX(that), -1); + ViewOvBox_SetFraction(VIEW_OV_BOX(that), 0); + return; + } + + g_assert(priv->over != NULL); + g_assert(GTK_IS_WIDGET(priv->over)); + + ViewOvBox_SetMin(VIEW_OV_BOX(that), priv->noOverlapPixels); + fraction = priv->opened + ? 1 : ((double)priv->overlapPixels / priv->over->allocation.height); + if (!animate) { + ViewOvBox_SetFraction(VIEW_OV_BOX(that), fraction); + } + ViewDrawer_SetGoal(VIEW_DRAWER(that), fraction); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerOnEnforceDelay -- + * + * Callback fired when a delayed update happens to update the drawer state. + * + * Results: + * FALSE to indicate timer should not repeat. + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static gboolean +ViewAutoDrawerOnEnforceDelay(ViewAutoDrawer *that) // IN +{ + that->priv->delayConnection = 0; + ViewAutoDrawerEnforce(that, TRUE); + + return FALSE; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerUpdate -- + * + * Decide whether an AutoDrawer should be opened or closed, and enforce + * that decision now or later. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewAutoDrawerUpdate(ViewAutoDrawer *that, // IN + gboolean immediate) // IN +{ + ViewAutoDrawerPrivate *priv = that->priv; + GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(that)); + GtkWindow *window; + + if (!toplevel || !GTK_WIDGET_TOPLEVEL(toplevel)) { + // The autoDrawer cannot function properly without a toplevel. + return; + } + window = GTK_WINDOW(toplevel); + + /* + * We decide to open the drawer by OR'ing several conditions. Evaluating a + * condition can have the side-effect of setting 'immediate' to TRUE, so we + * cannot stop evaluating the conditions after we have found one to be TRUE. + */ + + priv->opened = FALSE; + + /* Is the AutoDrawer pinned? */ + + if (priv->pinned) { + immediate = TRUE; + + priv->opened = TRUE; + } + + /* Is the mouse cursor inside the event box? */ + + { + int x; + int y; + + gtk_widget_get_pointer(priv->evBox, &x, &y); + g_assert(gtk_container_get_border_width( GTK_CONTAINER(priv->evBox)) + == 0); + if ( (guint)x < (guint)priv->evBox->allocation.width + && (guint)y < (guint)priv->evBox->allocation.height) { + priv->opened = TRUE; + } + } + + /* If there is a focused widget, is it inside the event box? */ + + { + GtkWidget *focus; + + focus = gtk_window_get_focus(window); + if (focus && gtk_widget_is_ancestor(focus, priv->evBox)) { + /* + * Override the default 'immediate' to make sure the 'over' widget + * immediately appears along with the widget the focused widget. + */ + immediate = TRUE; + + priv->opened = TRUE; + } + } + + /* If input is grabbed, is it on behalf of a widget inside the event box? */ + + if (!priv->inputUngrabbed) { + GtkWidget *grabbed = NULL; + + if (window->group && window->group->grabs) { + grabbed = GTK_WIDGET(window->group->grabs->data); + } + if (!grabbed) { + grabbed = gtk_grab_get_current(); + } +// g_assert(grabbed); + + if (GTK_IS_MENU(grabbed)) { + /* + * With cascading menus, the deepest menu owns the grab. Traverse the + * menu hierarchy up until we reach the attach widget for the whole + * hierarchy. + */ + + for (;;) { + GtkWidget *menuAttach; + GtkWidget *menuItemParent; + + menuAttach = gtk_menu_get_attach_widget(GTK_MENU(grabbed)); + if (!menuAttach) { + /* + * It is unfortunately not mandatory for a menu to have a proper + * attach widget set. + */ + break; + } + + grabbed = menuAttach; + if (!GTK_IS_MENU_ITEM(grabbed)) { + break; + } + + menuItemParent = gtk_widget_get_parent(grabbed); + g_return_if_fail(menuItemParent); + if (!GTK_IS_MENU(menuItemParent)) { + break; + } + + grabbed = menuItemParent; + } + } + + if (gtk_widget_is_ancestor(grabbed, priv->evBox)) { + /* + * Override the default 'immediate' to make sure the 'over' widget + * immediately appears along with the widget the grab happens on + * behalf of. + */ + immediate = TRUE; + + priv->opened = TRUE; + } + } + + if (priv->delayConnection) { + g_source_remove(priv->delayConnection); + } + if (immediate) { + ViewAutoDrawerEnforce(that, FALSE); + } else { + priv->delayConnection = g_timeout_add(priv->delayValue, + (GSourceFunc)ViewAutoDrawerOnEnforceDelay, that); + } +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerOnOverEnterLeave -- + * + * Respond to enter/leave events by doing a delayed update of the drawer + * state. + * + * Results: + * FALSE to indicate event was not handled. + * + * Side effects: + * Will queue delayed update. + * + *----------------------------------------------------------------------------- + */ + +static gboolean +ViewAutoDrawerOnOverEnterLeave(GtkWidget *evBox, // IN: Unused + GdkEventCrossing *event, // IN + ViewAutoDrawer *that) // IN +{ + /* + * This change happens in response to user input. By default, give the user + * some time to correct his input before reacting to the change. + */ + ViewAutoDrawerUpdate(that, FALSE); + + return FALSE; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerOnGrabNotify -- + * + * Respond to grab notifications by updating the drawer state. + * + * Results: + * None + * + * Side effects: + * Might queue delayed update. + * + *----------------------------------------------------------------------------- + */ + +static void +ViewAutoDrawerOnGrabNotify(GtkWidget *evBox, // IN: Unused + gboolean ungrabbed, // IN + ViewAutoDrawer *that) // IN +{ + ViewAutoDrawerPrivate *priv = that->priv; + + priv->inputUngrabbed = ungrabbed; + + /* + * This change happens in response to user input. By default, give the user + * some time to correct his input before reacting to the change. + */ + ViewAutoDrawerUpdate(that, FALSE); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerOnSetFocus -- + * + * Respond to changes in the focus widget of the autoDrawer's toplevel + * by recalculating the state. + * + * Results: + * None + * + * Side effects: + * Drawer state is updated. + * + *----------------------------------------------------------------------------- + */ + +static void +ViewAutoDrawerOnSetFocus(GtkWindow *window, // IN + GtkWidget *widget, // IN + ViewAutoDrawer *that) // IN +{ + /* + * This change happens in response to user input. By default, give the user + * some time to correct his input before reacting to the change. + */ + ViewAutoDrawerUpdate(that, FALSE); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerOnHierarchyChanged -- + * + * Respond to changes in the toplevel for the AutoDrawer. A toplevel is + * required for the AutoDrawer to calculate its state. + * + * Results: + * None + * + * Side effects: + * Drawer state is updated. + * + *----------------------------------------------------------------------------- + */ + +static void +ViewAutoDrawerOnHierarchyChanged(ViewAutoDrawer *that, // IN + GtkWidget *oldToplevel) // IN +{ + GtkWidget *newToplevel = gtk_widget_get_toplevel(GTK_WIDGET(that)); + + if (oldToplevel && GTK_WIDGET_TOPLEVEL(oldToplevel)) { + g_signal_handlers_disconnect_by_func(oldToplevel, + G_CALLBACK(ViewAutoDrawerOnSetFocus), + that); + } + + if (newToplevel && GTK_WIDGET_TOPLEVEL(newToplevel)) { + g_signal_connect_after(newToplevel, "set-focus", + G_CALLBACK(ViewAutoDrawerOnSetFocus), that); + } + + /* This change happens programmatically. Always react to it immediately. */ + ViewAutoDrawerUpdate(that, TRUE); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerSetOver -- + * + * Virtual method override so that the user's over widget is placed + * inside the AutoDrawer's event box. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewAutoDrawerSetOver(ViewOvBox *ovBox, // IN + GtkWidget *widget) // IN +{ + ViewAutoDrawer *that = VIEW_AUTODRAWER(ovBox); + ViewAutoDrawerPrivate *priv = that->priv; + GtkWidget *oldChild = gtk_bin_get_child(GTK_BIN(priv->evBox)); + + if (oldChild) { + g_object_ref(oldChild); + gtk_container_remove(GTK_CONTAINER(priv->evBox), oldChild); + } + + if (widget) { + gtk_container_add(GTK_CONTAINER(priv->evBox), widget); + } + + if (oldChild) { + g_object_unref(oldChild); + } + + priv->over = widget; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerRefreshPacking -- + * + * Sets the actual packing values for fill, expand, and packing + * given internal settings. + * + * Results: + * None + * + * Side effects: + * Drawer state is updated. + * + *----------------------------------------------------------------------------- + */ + +void +ViewAutoDrawerRefreshPacking(ViewAutoDrawer *that) // IN +{ + gboolean expand; + gboolean fill; + guint padding; + + expand = (that->priv->fill || (that->priv->offset < 0)); + fill = that->priv->fill; + padding = (expand || fill) ? 0 : that->priv->offset; + + gtk_box_set_child_packing(GTK_BOX(that), that->priv->evBox, + expand, fill, padding, GTK_PACK_START); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerInit -- + * + * Initialize a ViewAutoDrawer. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewAutoDrawerInit(GTypeInstance *instance, // IN + gpointer klass) // Unused +{ + ViewAutoDrawer *that; + ViewAutoDrawerPrivate *priv; + + that = VIEW_AUTODRAWER(instance); + that->priv = VIEW_AUTODRAWER_GET_PRIVATE(that); + priv = that->priv; + + priv->active = TRUE; + priv->pinned = FALSE; + priv->inputUngrabbed = TRUE; + priv->delayConnection = 0; + priv->delayValue = 250; + priv->overlapPixels = 0; + priv->noOverlapPixels = 1; + + priv->fill = TRUE; + priv->offset = -1; + + priv->evBox = gtk_event_box_new(); + gtk_widget_show(priv->evBox); + VIEW_OV_BOX_CLASS(parentClass)->set_over(VIEW_OV_BOX(that), priv->evBox); + + g_signal_connect(priv->evBox, "enter-notify-event", + G_CALLBACK(ViewAutoDrawerOnOverEnterLeave), that); + g_signal_connect(priv->evBox, "leave-notify-event", + G_CALLBACK(ViewAutoDrawerOnOverEnterLeave), that); + g_signal_connect(priv->evBox, "grab-notify", + G_CALLBACK(ViewAutoDrawerOnGrabNotify), that); + + g_signal_connect(that, "hierarchy-changed", + G_CALLBACK(ViewAutoDrawerOnHierarchyChanged), NULL); + + /* This change happens programmatically. Always react to it immediately. */ + ViewAutoDrawerUpdate(that, TRUE); + + ViewAutoDrawerRefreshPacking(that); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerFinalize -- + * + * "finalize" method of a ViewAutoDrawer. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewAutoDrawerFinalize(GObject *object) // IN +{ + ViewAutoDrawer *that; + + that = VIEW_AUTODRAWER(object); + if (that->priv->delayConnection) { + g_source_remove(that->priv->delayConnection); + } + + G_OBJECT_CLASS(parentClass)->finalize(object); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawerClassInit -- + * + * Initialize the ViewAutoDrawerClass. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewAutoDrawerClassInit(gpointer klass) // IN +{ + GObjectClass *objectClass = G_OBJECT_CLASS(klass); + ViewOvBoxClass *ovBoxClass = VIEW_OV_BOX_CLASS(klass); + + parentClass = g_type_class_peek_parent(klass); + + objectClass->finalize = ViewAutoDrawerFinalize; + + ovBoxClass->set_over = ViewAutoDrawerSetOver; + + g_type_class_add_private(objectClass, sizeof(ViewAutoDrawerPrivate)); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawer_GetType -- + * + * Get the (memoized) GType of the ViewAutoDrawer GTK+ object. + * + * Results: + * The GType + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +GType +ViewAutoDrawer_GetType(void) +{ + static GType type = 0; + + if (type == 0) { + static const GTypeInfo info = { + sizeof (ViewAutoDrawerClass), + NULL, /* BaseInit */ + NULL, /* BaseFinalize */ + (GClassInitFunc)ViewAutoDrawerClassInit, + NULL, + NULL, /* Class Data */ + sizeof (ViewAutoDrawer), + 0, /* n_preallocs */ + (GInstanceInitFunc)ViewAutoDrawerInit, + }; + + type = g_type_register_static(VIEW_TYPE_DRAWER, "ViewAutoDrawer", &info, 0); + } + + return type; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawer_New -- + * + * Create a new ViewAutoDrawer GTK+ widget. + * + * Results: + * The widget + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +GtkWidget * +ViewAutoDrawer_New(void) +{ + return GTK_WIDGET(g_object_new(VIEW_TYPE_AUTODRAWER, NULL)); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawer_SetSlideDelay -- + * + * Set the response time of an AutoDrawer in ms., i.e. the time that + * elapses between: + * - when the AutoDrawer notices a change that can impact the outcome of + * the decision to open or close the drawer, + * and + * - when the AutoDrawer makes such decision. + * + * Users move the mouse inaccurately. If they temporarily move the mouse in + * or out of the AutoDrawer for less than the reponse time, their move will + * be ignored. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +void +ViewAutoDrawer_SetSlideDelay(ViewAutoDrawer *that, // IN + guint delay) // IN +{ + g_return_if_fail(VIEW_IS_AUTODRAWER(that)); + + that->priv->delayValue = delay; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawer_SetOverlapPixels -- + * + * Set the number of pixels that the over widget overlaps the under widget + * when not open. + * + * Results: + * None + * + * Side effects: + * Drawer state is updated. + * + *----------------------------------------------------------------------------- + */ + +void +ViewAutoDrawer_SetOverlapPixels(ViewAutoDrawer *that, // IN + guint overlapPixels) // IN +{ + g_return_if_fail(VIEW_IS_AUTODRAWER(that)); + + that->priv->overlapPixels = overlapPixels; + + /* This change happens programmatically. Always react to it immediately. */ + ViewAutoDrawerUpdate(that, TRUE); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawer_SetNoOverlapPixels -- + * + * Set the number of pixels that the drawer reserves when not open. The + * over widget does not overlap the under widget over these pixels. + * + * Results: + * None + * + * Side effects: + * Drawer state is updated. + * + *----------------------------------------------------------------------------- + */ + +void +ViewAutoDrawer_SetNoOverlapPixels(ViewAutoDrawer *that, // IN + guint noOverlapPixels) // IN +{ + g_return_if_fail(VIEW_IS_AUTODRAWER(that)); + + that->priv->noOverlapPixels = noOverlapPixels; + + /* This change happens programmatically. Always react to it immediately. */ + ViewAutoDrawerUpdate(that, TRUE); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawer_SetActive -- + * + * Set whether the AutoDrawer is active or not. That is to say, whether + * it is acting as a drawer or not. When inactive, the over and under + * widget do not overlap and the net result is very much like a vbox. + * + * Results: + * None + * + * Side effects: + * Drawer state is updated. + * + *----------------------------------------------------------------------------- + */ + +void +ViewAutoDrawer_SetActive(ViewAutoDrawer *that, // IN + gboolean active) // IN +{ + g_return_if_fail(VIEW_IS_AUTODRAWER(that)); + + that->priv->active = active; + + /* This change happens programmatically. Always react to it immediately. */ + ViewAutoDrawerUpdate(that, TRUE); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawer_SetPinned -- + * + * Set whether the AutoDrawer is pinned or not. When pinned, the + * AutoDrawer will stay open regardless of the state of any other inputs. + * + * Results: + * None + * + * Side effects: + * Drawer state is updated. + * + *----------------------------------------------------------------------------- + */ + +void +ViewAutoDrawer_SetPinned(ViewAutoDrawer *that, // IN + gboolean pinned) // IN +{ + g_return_if_fail(VIEW_IS_AUTODRAWER(that)); + + that->priv->pinned = pinned; + + /* + * This change happens in response to user input. By default, give the user + * some time to correct his input before reacting to the change. + */ + ViewAutoDrawerUpdate(that, FALSE); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawer_SetFill -- + * + * Set whether the Over widget of the AutoDrawer should fill the full + * width of the AutoDrawer or just occupy the minimum space it needs. + * A value of TRUE overrides offset settings. + * + * Results: + * None + * + * Side effects: + * Drawer state is updated. + * + *----------------------------------------------------------------------------- + */ + +void +ViewAutoDrawer_SetFill(ViewAutoDrawer *that, // IN + gboolean fill) // IN +{ + g_return_if_fail(VIEW_IS_AUTODRAWER(that)); + + that->priv->fill = fill; + ViewAutoDrawerRefreshPacking(that); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewAutoDrawer_SetOffset -- + * + * Set the drawer's X offset, or distance in pixels from the left side. + * If offset is -1, the drawer will be centered. If fill has been set + * TRUE by SetFill, these settings will have no effect. + * + * Results: + * None + * + * Side effects: + * Drawer state is updated. + * + *----------------------------------------------------------------------------- + */ + +void +ViewAutoDrawer_SetOffset(ViewAutoDrawer *that, // IN + gint offset) // IN +{ + g_return_if_fail(VIEW_IS_AUTODRAWER(that)); + + that->priv->offset = offset; + ViewAutoDrawerRefreshPacking(that); +} diff -Nru vinagre-2.26.1/vinagre/view/autoDrawer.h vinagre-2.29.1/vinagre/view/autoDrawer.h --- vinagre-2.26.1/vinagre/view/autoDrawer.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/view/autoDrawer.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,89 @@ +/* ************************************************************************* + * Copyright (c) 2005 VMware Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * *************************************************************************/ + +/* + * autoDrawer.h -- + * + * Declarations for the ViewAutoDrawer GTK+ widget. + */ + + +#ifndef LIBVIEW_AUTODRAWER_H +#define LIBVIEW_AUTODRAWER_H + + +#include "drawer.h" + + +#define VIEW_TYPE_AUTODRAWER (ViewAutoDrawer_GetType()) +#define VIEW_AUTODRAWER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VIEW_TYPE_AUTODRAWER, ViewAutoDrawer)) +#define VIEW_AUTODRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VIEW_TYPE_AUTODRAWER, ViewAutoDrawerClass)) +#define VIEW_IS_AUTODRAWER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VIEW_TYPE_AUTODRAWER)) +#define VIEW_IS_AUTODRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VIEW_TYPE_AUTODRAWER)) +#define VIEW_AUTODRAWER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VIEW_TYPE_AUTODRAWER, ViewAutoDrawerClass)) + +typedef struct _ViewAutoDrawerPrivate ViewAutoDrawerPrivate; + +typedef struct _ViewAutoDrawer { + /* Must come first. */ + ViewDrawer parent; + + /* Private. */ + ViewAutoDrawerPrivate *priv; +} ViewAutoDrawer; + +typedef struct _ViewAutoDrawerClass { + /* Must come first. */ + ViewDrawerClass parent; + + /* Padding for future expansion */ + void (*_view_reserved0)(void); + void (*_view_reserved1)(void); + void (*_view_reserved2)(void); + void (*_view_reserved3)(void); +} ViewAutoDrawerClass; + + +G_BEGIN_DECLS + + +GType ViewAutoDrawer_GetType(void); + +GtkWidget *ViewAutoDrawer_New(void); + +void ViewAutoDrawer_SetSlideDelay(ViewAutoDrawer *that, guint delay); +void ViewAutoDrawer_SetOverlapPixels(ViewAutoDrawer *that, guint overlapPixels); +void ViewAutoDrawer_SetNoOverlapPixels(ViewAutoDrawer *that, guint noOverlapPixels); + +void ViewAutoDrawer_SetActive(ViewAutoDrawer *that, gboolean active); + +void ViewAutoDrawer_SetPinned(ViewAutoDrawer *that, gboolean pinned); + +void ViewAutoDrawer_SetFill(ViewAutoDrawer *that, gboolean fill); + +void ViewAutoDrawer_SetOffset(ViewAutoDrawer *that, gint offset); + +G_END_DECLS + + +#endif /* LIBVIEW_AUTODRAWER_H */ diff -Nru vinagre-2.26.1/vinagre/view/drawer.c vinagre-2.29.1/vinagre/view/drawer.c --- vinagre-2.26.1/vinagre/view/drawer.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/view/drawer.c 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,332 @@ +/* ************************************************************************* + * Copyright (c) 2005 VMware, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * *************************************************************************/ + +/* + * drawer.c - + * + * Implementation of a GTK+ drawer, i.e. a widget that opens and closes by + * sliding smoothly, at constant speed, over another one. + */ + + +#include "drawer.h" + + +struct _ViewDrawerPrivate +{ + unsigned int period; + double step; + double goal; + struct { + gboolean pending; + guint id; + } timer; +}; + +#define VIEW_DRAWER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), VIEW_TYPE_DRAWER, ViewDrawerPrivate)) + +/* The unaltered parent class. */ +static ViewOvBoxClass *parentClass; + + +/* + *----------------------------------------------------------------------------- + * + * ViewDrawerInit -- + * + * Initialize a ViewDrawer. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewDrawerInit(GTypeInstance *instance, // IN + gpointer klass) // Unused +{ + ViewDrawer *that; + + that = VIEW_DRAWER(instance); + that->priv = VIEW_DRAWER_GET_PRIVATE(that); + + that->priv->period = 10; + that->priv->step = 0.2; + that->priv->timer.pending = FALSE; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewDrawerFinalize -- + * + * "finalize" method of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewDrawerFinalize(GObject *object) // IN +{ + ViewDrawer *that; + ViewDrawerPrivate *priv; + + that = VIEW_DRAWER(object); + priv = that->priv; + + if (priv->timer.pending) { + g_source_remove(priv->timer.id); + priv->timer.pending = FALSE; + } + + G_OBJECT_CLASS(parentClass)->finalize(object); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewDrawerClassInit -- + * + * Initialize the ViewDrawerClass. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewDrawerClassInit(gpointer klass) // IN +{ + GObjectClass *objectClass = G_OBJECT_CLASS(klass); + + parentClass = g_type_class_peek_parent(klass); + + objectClass->finalize = ViewDrawerFinalize; + + g_type_class_add_private(objectClass, sizeof(ViewDrawerPrivate)); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewDrawer_GetType -- + * + * Get the (memoized) GType of the ViewDrawer GTK+ object. + * + * Results: + * The GType + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +GType +ViewDrawer_GetType(void) +{ + static GType type = 0; + + if (type == 0) { + static const GTypeInfo info = { + sizeof (ViewDrawerClass), + NULL, /* BaseInit */ + NULL, /* BaseFinalize */ + (GClassInitFunc)ViewDrawerClassInit, + NULL, + NULL, /* Class Data */ + sizeof (ViewDrawer), + 0, /* n_preallocs */ + (GInstanceInitFunc)ViewDrawerInit, + }; + + type = g_type_register_static(VIEW_TYPE_OV_BOX, "ViewDrawer", &info, 0); + } + + return type; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewDrawer_New -- + * + * Create a new ViewDrawer GTK+ widget. + * + * Results: + * The widget + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +GtkWidget * +ViewDrawer_New(void) +{ + ViewDrawer *that; + + that = VIEW_DRAWER(g_object_new(VIEW_TYPE_DRAWER, NULL)); + + return GTK_WIDGET(that); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewDrawerOnTimer -- + * + * Timer callback of a ViewDrawer. If we have reached the goal, deschedule + * the timer. Otherwise make progress towards the goal, and keep the timer + * scheduled. + * + * Results: + * TRUE if the timer must be rescheduled. + * FALSE if the timer must not be rescheduled. + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static gint +ViewDrawerOnTimer(gpointer data) // IN +{ + ViewDrawer *that; + ViewDrawerPrivate *priv; + double fraction; + + that = VIEW_DRAWER(data); + priv = that->priv; + + fraction = ViewOvBox_GetFraction(VIEW_OV_BOX(that)); + /* + * Comparing double values with '==' is most of the time a bad idea, due to + * the inexact representation of values in binary (see + * http://www2.hursley.ibm.com/decimal/decifaq1.html and http://boost.org/libs/test/doc/components/test_tools/floating_point_comparison.html). + * But in this particular case it is legitimate. --hpreg + */ + if (priv->goal == fraction) { + return priv->timer.pending = FALSE; + } + + ViewOvBox_SetFraction(VIEW_OV_BOX(that), + priv->goal > fraction + ? MIN(fraction + priv->step, priv->goal) + : MAX(fraction - priv->step, priv->goal)); + return TRUE; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewDrawer_SetSpeed -- + * + * Set the 'period' (in ms.) and 'step' properties of a ViewDrawer, which + * determine the speed and smoothness of the drawer's motion. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +void +ViewDrawer_SetSpeed(ViewDrawer *that, // IN + unsigned int period, // IN + double step) // IN +{ + ViewDrawerPrivate *priv; + + g_return_if_fail(that != NULL); + + priv = that->priv; + + priv->period = period; + if (priv->timer.pending) { + g_source_remove(priv->timer.id); + priv->timer.id = g_timeout_add(priv->period, ViewDrawerOnTimer, that); + } + priv->step = step; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewDrawer_SetGoal -- + * + * Set the 'goal' property of a ViewDrawer, i.e. how much the drawer should + * be opened when it is done sliding. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +void +ViewDrawer_SetGoal(ViewDrawer *that, // IN + double goal) // IN +{ + ViewDrawerPrivate *priv; + + g_return_if_fail(that != NULL); + g_return_if_fail(goal >= 0 && goal <= 1); + + priv = that->priv; + + priv->goal = goal; + if (priv->timer.pending == FALSE) { + priv->timer.id = g_timeout_add(priv->period, ViewDrawerOnTimer, that); + priv->timer.pending = TRUE; + } +} diff -Nru vinagre-2.26.1/vinagre/view/drawer.h vinagre-2.29.1/vinagre/view/drawer.h --- vinagre-2.26.1/vinagre/view/drawer.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/view/drawer.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,82 @@ +/* ************************************************************************* + * Copyright (c) 2005 VMware, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * *************************************************************************/ + +/* + * drawer.h -- + * + * Declarations for the ViewDrawer GTK+ widget. + */ + + +#ifndef LIBVIEW_DRAWER_H +#define LIBVIEW_DRAWER_H + + +#include "ovBox.h" + + +#define VIEW_TYPE_DRAWER (ViewDrawer_GetType()) +#define VIEW_DRAWER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VIEW_TYPE_DRAWER, ViewDrawer)) +#define VIEW_DRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VIEW_TYPE_DRAWER, ViewDrawerClass)) +#define VIEW_IS_DRAWER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VIEW_TYPE_DRAWER)) +#define VIEW_IS_DRAWER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VIEW_TYPE_DRAWER)) +#define VIEW_DRAWER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VIEW_TYPE_DRAWER, ViewDrawerClass)) + +typedef struct _ViewDrawerPrivate ViewDrawerPrivate; + +typedef struct _ViewDrawer { + /* Must come first. */ + ViewOvBox parent; + + /* Private. */ + ViewDrawerPrivate *priv; +} ViewDrawer; + + +typedef struct _ViewDrawerClass { + /* Must come first. */ + ViewOvBoxClass parent; + + /* Padding for future expansion */ + void (*_view_reserved0)(void); + void (*_view_reserved1)(void); + void (*_view_reserved2)(void); + void (*_view_reserved3)(void); +} ViewDrawerClass; + + +G_BEGIN_DECLS + + +GType ViewDrawer_GetType(void); + +GtkWidget *ViewDrawer_New(void); + +void ViewDrawer_SetSpeed(ViewDrawer *that, unsigned int period, double step); +void ViewDrawer_SetGoal(ViewDrawer *that, double fraction); + + +G_END_DECLS + + +#endif /* LIBVIEW_DRAWER_H */ diff -Nru vinagre-2.26.1/vinagre/view/Makefile.am vinagre-2.29.1/vinagre/view/Makefile.am --- vinagre-2.26.1/vinagre/view/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/view/Makefile.am 2009-08-25 01:59:43.000000000 +0100 @@ -0,0 +1,19 @@ +NULL = + +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_srcdir)/vinagre \ + -I$(top_builddir)/vinagre \ + $(VINAGRE_CFLAGS) \ + $(NULL) + +noinst_LTLIBRARIES = libview.la + +libview_la_SOURCES = \ + autoDrawer.h autoDrawer.c \ + drawer.h drawer.c \ + ovBox.h ovBox.c \ + $(NULL) + +-include $(top_srcdir)/git.mk diff -Nru vinagre-2.26.1/vinagre/view/Makefile.in vinagre-2.29.1/vinagre/view/Makefile.in --- vinagre-2.26.1/vinagre/view/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/view/Makefile.in 2009-10-26 13:35:27.000000000 +0000 @@ -0,0 +1,560 @@ +# Makefile.in generated by automake 1.11 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = vinagre/view +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libview_la_LIBADD = +am__objects_1 = +am_libview_la_OBJECTS = autoDrawer.lo drawer.lo ovBox.lo \ + $(am__objects_1) +libview_la_OBJECTS = $(am_libview_la_OBJECTS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libview_la_SOURCES) +DIST_SOURCES = $(libview_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ACTIVE_PLUGINS = @ACTIVE_PLUGINS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPLET_CFLAGS = @APPLET_CFLAGS@ +APPLET_LIBS = @APPLET_LIBS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AVAHI_CFLAGS = @AVAHI_CFLAGS@ +AVAHI_LIBS = @AVAHI_LIBS@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LOADER_LIBTOOL_FLAGS = @LOADER_LIBTOOL_FLAGS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +REBUILD = @REBUILD@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SSH_CFLAGS = @SSH_CFLAGS@ +SSH_LIBS = @SSH_LIBS@ +STRIP = @STRIP@ +TELEPATHY_CFLAGS = @TELEPATHY_CFLAGS@ +TELEPATHY_LIBS = @TELEPATHY_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +VINAGRE_API_VERSION = @VINAGRE_API_VERSION@ +VINAGRE_CFLAGS = @VINAGRE_CFLAGS@ +VINAGRE_IMPLIB = @VINAGRE_IMPLIB@ +VINAGRE_LIBS = @VINAGRE_LIBS@ +VINAGRE_PLUGINS_DATA_DIR = @VINAGRE_PLUGINS_DATA_DIR@ +VINAGRE_PLUGINS_LIBS_DIR = @VINAGRE_PLUGINS_LIBS_DIR@ +VNC_CFLAGS = @VNC_CFLAGS@ +VNC_LIBS = @VNC_LIBS@ +VTE_CFLAGS = @VTE_CFLAGS@ +VTE_LIBS = @VTE_LIBS@ +WARN_CFLAGS = @WARN_CFLAGS@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +NULL = +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_srcdir)/vinagre \ + -I$(top_builddir)/vinagre \ + $(VINAGRE_CFLAGS) \ + $(NULL) + +noinst_LTLIBRARIES = libview.la +libview_la_SOURCES = \ + autoDrawer.h autoDrawer.c \ + drawer.h drawer.c \ + ovBox.h ovBox.c \ + $(NULL) + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu vinagre/view/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu vinagre/view/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libview.la: $(libview_la_OBJECTS) $(libview_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libview_la_OBJECTS) $(libview_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autoDrawer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovBox.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am + + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru vinagre-2.26.1/vinagre/view/ovBox.c vinagre-2.29.1/vinagre/view/ovBox.c --- vinagre-2.26.1/vinagre/view/ovBox.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/view/ovBox.c 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,902 @@ +/* ************************************************************************* + * Copyright (c) 2005 VMware, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * *************************************************************************/ + +/* + * ovBox.c -- + * + * Implementation of a GTK+ overlapping box. Allows you to display and + * quickly move a child that overlaps another child. + * + * Implementation notes + * -------------------- + * + * Changing 'fraction' is fast (we just move the 'overWin' X window, which + * ultimately copies a rectangle on the X server side), and does not + * flicker (the 'under' and 'over' GTK children are not re-drawn, except + * for parts of them that become exposed). + * + * o Initially, we thought it could be done with only 2 X windows + * + * Layout Hierarchy + * ------ --------- + * + * /- overWin --\ underWin + * | | overWin + * /-+- underWin -+-\ + * | | | | + * | \------------/ | + * | | + * \----------------/ + * + * But the 'under' GTK child could create other X windows inside + * 'underWin', which makes it impossible to guarantee that 'overWin' + * will stay stacked on top. + * + * o So we are forced to use 3 X windows + * + * Layout Hierarchy + * ------ --------- + * + * /- overWin --\ window + * | | overWin + * /---+- window ---+---\ underWin + * | | | | + * | /-+- underWin -+-\ | + * | | | | | | + * | | \------------/ | | + * | | | | + * | \----------------/ | + * | | + * \--------------------/ + * + * --hpreg + */ + + +#include "ovBox.h" + + +struct _ViewOvBoxPrivate +{ + GdkWindow *underWin; + GtkWidget *under; + GdkWindow *overWin; + GtkWidget *over; + GtkRequisition overR; + unsigned int min; + double fraction; +}; + +#define VIEW_OV_BOX_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), VIEW_TYPE_OV_BOX, ViewOvBoxPrivate)) + +/* The unaltered parent class. */ +static GtkBoxClass *parentClass; + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxInit -- + * + * Initialize a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxInit(GTypeInstance *instance, // IN + gpointer klass) // Unused +{ + ViewOvBox *that; + ViewOvBoxPrivate *priv; + + that = VIEW_OV_BOX(instance); + that->priv = VIEW_OV_BOX_GET_PRIVATE(that); + priv = that->priv; + + GTK_WIDGET_UNSET_FLAGS(that, GTK_NO_WINDOW); + + priv->underWin = NULL; + priv->under = NULL; + priv->overWin = NULL; + priv->over = NULL; + priv->overR.height = -1; + priv->overR.width = -1; + priv->min = 0; + priv->fraction = 0; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxMap -- + * + * "map" method of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxMap(GtkWidget *widget) // IN +{ + gdk_window_show(widget->window); + GTK_WIDGET_CLASS(parentClass)->map(widget); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxUnmap -- + * + * "unmap" method of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxUnmap(GtkWidget *widget) // IN +{ + gdk_window_hide(widget->window); + GTK_WIDGET_CLASS(parentClass)->unmap(widget); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxGetActualMin -- + * + * Retrieve the actual 'min' value, i.e. a value that is guaranteed not to + * exceed the height of the 'over' child. + * + * Results: + * The actual 'min' value. + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static inline unsigned int +ViewOvBoxGetActualMin(ViewOvBox *that) // IN +{ + return MIN(that->priv->min, that->priv->overR.height); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxGetUnderGeometry -- + * + * Retrieve the geometry to apply to 'that->underWin'. + * + * Results: + * The geometry + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxGetUnderGeometry(ViewOvBox *that, // IN + int *x, // OUT + int *y, // OUT + int *width, // OUT + int *height) // OUT +{ + unsigned int min; + GtkAllocation *allocation; + + min = ViewOvBoxGetActualMin(that); + allocation = >K_WIDGET(that)->allocation; + + *x = 0; + *y = min; + *width = allocation->width; + *height = allocation->height - min; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxGetOverGeometry -- + * + * Retrieve the geometry to apply to 'that->overWin'. + * + * Results: + * The geometry + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxGetOverGeometry(ViewOvBox *that, // IN + int *x, // OUT + int *y, // OUT + int *width, // OUT + int *height) // OUT +{ + ViewOvBoxPrivate *priv; + gboolean expand; + gboolean fill; + guint padding; + unsigned int boxWidth; + + priv = that->priv; + + if (priv->over) { + /* + * When a child's expand or fill property changes, GtkBox queues + * a resize for the child. + */ + gtk_container_child_get(GTK_CONTAINER(that), priv->over, + "expand", &expand, + "fill", &fill, + "padding", &padding, + NULL); + } else { + /* Default values used by GtkBox. */ + expand = TRUE; + fill = TRUE; + padding = 0; + } + + boxWidth = GTK_WIDGET(that)->allocation.width; + if (!expand) { + *width = MIN(priv->overR.width, boxWidth - padding); + *x = padding; + } else if (!fill) { + *width = MIN(priv->overR.width, boxWidth); + *x = (boxWidth - *width) / 2; + } else { + *width = boxWidth; + *x = 0; + } + + *y = (priv->overR.height - ViewOvBoxGetActualMin(that)) + * (priv->fraction - 1); + *height = priv->overR.height; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxSetBackground -- + * + * Set the background color of the 'underWin' and 'overWin' X windows. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxSetBackground(ViewOvBox *that) // IN +{ + GtkWidget *widget; + + widget = GTK_WIDGET(that); + gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL); + gtk_style_set_background(widget->style, that->priv->underWin, GTK_STATE_NORMAL); + gtk_style_set_background(widget->style, that->priv->overWin, GTK_STATE_NORMAL); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxRealize -- + * + * "realize" method of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxRealize(GtkWidget *widget) // IN +{ + ViewOvBox *that; + ViewOvBoxPrivate *priv; + GdkWindowAttr attributes; + gint mask; + GtkAllocation *allocation; + + GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED); + + that = VIEW_OV_BOX(widget); + priv = that->priv; + + attributes.window_type = GDK_WINDOW_CHILD; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual(widget); + attributes.colormap = gtk_widget_get_colormap(widget); + attributes.event_mask = gtk_widget_get_events(widget) | GDK_EXPOSURE_MASK; + mask = GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_X | GDK_WA_Y; + + allocation = &widget->allocation; + attributes.x = allocation->x; + attributes.y = allocation->y; + attributes.width = allocation->width; + attributes.height = allocation->height; + widget->window = gdk_window_new(gtk_widget_get_parent_window(widget), + &attributes, mask); + gdk_window_set_user_data(widget->window, that); + widget->style = gtk_style_attach(widget->style, widget->window); + + /* + * The order in which we create the children X window matters: the child + * created last is stacked on top. --hpreg + */ + + ViewOvBoxGetUnderGeometry(that, &attributes.x, &attributes.y, + &attributes.width, &attributes.height); + priv->underWin = gdk_window_new(widget->window, &attributes, mask); + gdk_window_set_user_data(priv->underWin, that); + if (priv->under) { + gtk_widget_set_parent_window(priv->under, priv->underWin); + } + gdk_window_show(priv->underWin); + + ViewOvBoxGetOverGeometry(that, &attributes.x, &attributes.y, + &attributes.width, &attributes.height); + priv->overWin = gdk_window_new(widget->window, &attributes, mask); + gdk_window_set_user_data(priv->overWin, that); + if (priv->over) { + gtk_widget_set_parent_window(priv->over, priv->overWin); + } + gdk_window_show(priv->overWin); + + ViewOvBoxSetBackground(that); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxUnrealize -- + * + * "unrealize" method of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxUnrealize(GtkWidget *widget) // IN +{ + ViewOvBox *that; + ViewOvBoxPrivate *priv; + + that = VIEW_OV_BOX(widget); + priv = that->priv; + + /* + * Unrealize the parent before destroying the windows so that we end up + * unrealizing all the child widgets before destroying the child windows, + * giving them a chance to reparent their windows before we clobber them. + */ + GTK_WIDGET_CLASS(parentClass)->unrealize(widget); + + + gdk_window_set_user_data(priv->underWin, NULL); + gdk_window_destroy(priv->underWin); + priv->underWin = NULL; + + gdk_window_set_user_data(priv->overWin, NULL); + gdk_window_destroy(priv->overWin); + priv->overWin = NULL; + +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxSizeRequest -- + * + * "size_request" method of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxSizeRequest(GtkWidget *widget, // IN + GtkRequisition *requisition) // OUT +{ + ViewOvBox *that; + ViewOvBoxPrivate *priv; + GtkRequisition underR; + gboolean expand; + gboolean fill; + guint padding; + unsigned int min; + + that = VIEW_OV_BOX(widget); + priv = that->priv; + + gtk_widget_size_request(priv->under, &underR); + gtk_widget_size_request(priv->over, &priv->overR); + + gtk_container_child_get(GTK_CONTAINER(that), priv->over, + "expand", &expand, + "fill", &fill, + "padding", &padding, + NULL); + requisition->width = MAX(underR.width, + priv->overR.width + ((expand || fill) ? 0 : padding)); + min = ViewOvBoxGetActualMin(that); + requisition->height = MAX(underR.height + min, priv->overR.height); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxSizeAllocate -- + * + * "size_allocate" method of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxSizeAllocate(GtkWidget *widget, // IN + GtkAllocation *allocation) // IN +{ + ViewOvBox *that; + ViewOvBoxPrivate *priv; + GtkAllocation under; + GtkAllocation over; + + widget->allocation = *allocation; + + that = VIEW_OV_BOX(widget); + priv = that->priv; + + ViewOvBoxGetUnderGeometry(that, &under.x, &under.y, &under.width, + &under.height); + ViewOvBoxGetOverGeometry(that, &over.x, &over.y, &over.width, &over.height); + + if (GTK_WIDGET_REALIZED(widget)) { + gdk_window_move_resize(widget->window, allocation->x, allocation->y, + allocation->width, allocation->height); + gdk_window_move_resize(priv->underWin, under.x, under.y, under.width, + under.height); + gdk_window_move_resize(priv->overWin, over.x, over.y, over.width, + over.height); + } + + under.x = 0; + under.y = 0; + gtk_widget_size_allocate(priv->under, &under); + over.x = 0; + over.y = 0; + gtk_widget_size_allocate(priv->over, &over); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxStyleSet -- + * + * "style_set" method of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxStyleSet(GtkWidget *widget, // IN + GtkStyle *previousStyle) // IN: Unused +{ + ViewOvBox *that; + + that = VIEW_OV_BOX(widget); + + if (GTK_WIDGET_REALIZED(widget)) { + ViewOvBoxSetBackground(that); + } + + GTK_WIDGET_CLASS(parentClass)->style_set(widget, previousStyle); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxSetChild -- + * + * Set a child of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxSetChild(ViewOvBox *that, // IN + GtkWidget **child, // IN + GdkWindow *childWin, // IN + GtkWidget *widget) // IN +{ + GtkWidget *oldChild = *child; + + if (oldChild) { + g_object_ref(oldChild); + gtk_container_remove(GTK_CONTAINER(that), oldChild); + } + + *child = widget; + if (*child) { + gtk_widget_set_parent_window(widget, childWin); + gtk_container_add(GTK_CONTAINER(that), *child); + } + + if (oldChild) { + g_object_unref(oldChild); + } +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxSetOver -- + * + * Base implementation of ViewOvBox_SetOver. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxSetOver(ViewOvBox *that, // IN + GtkWidget *widget) // IN +{ + ViewOvBoxSetChild(that, &that->priv->over, that->priv->overWin, widget); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBoxClassInit -- + * + * Initialize the ViewOvBoxClass. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +static void +ViewOvBoxClassInit(ViewOvBoxClass *klass) // IN +{ + GObjectClass *objectClass; + GtkWidgetClass *widgetClass; + + objectClass = G_OBJECT_CLASS(klass); + widgetClass = GTK_WIDGET_CLASS(klass); + + widgetClass->map = ViewOvBoxMap; + widgetClass->unmap = ViewOvBoxUnmap; + widgetClass->realize = ViewOvBoxRealize; + widgetClass->unrealize = ViewOvBoxUnrealize; + widgetClass->size_request = ViewOvBoxSizeRequest; + widgetClass->size_allocate = ViewOvBoxSizeAllocate; + widgetClass->style_set = ViewOvBoxStyleSet; + + klass->set_over = ViewOvBoxSetOver; + + parentClass = g_type_class_peek_parent(klass); + + g_type_class_add_private(objectClass, sizeof(ViewOvBoxPrivate)); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBox_GetType -- + * + * Get the (memoized) GType of the ViewOvBox GTK+ object. + * + * Results: + * The GType + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +GType +ViewOvBox_GetType(void) +{ + static GType type = 0; + + if (type == 0) { + static const GTypeInfo info = { + sizeof (ViewOvBoxClass), + NULL, /* BaseInit */ + NULL, /* BaseFinalize */ + (GClassInitFunc)ViewOvBoxClassInit, + NULL, + NULL, /* Class Data */ + sizeof (ViewOvBox), + 0, /* n_preallocs */ + (GInstanceInitFunc)ViewOvBoxInit, + }; + + type = g_type_register_static(GTK_TYPE_BOX, "ViewOvBox", &info, 0); + } + + return type; +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBox_New -- + * + * Create a new ViewOvBox GTK+ widget. + * + * Results: + * The widget + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +GtkWidget * +ViewOvBox_New(void) +{ + ViewOvBox *that; + + that = VIEW_OV_BOX(g_object_new(VIEW_TYPE_OV_BOX, NULL)); + + return GTK_WIDGET(that); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBox_SetUnder -- + * + * Set the under widget of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +void +ViewOvBox_SetUnder(ViewOvBox *that, // IN + GtkWidget *widget) // IN +{ + g_return_if_fail(that != NULL); + + ViewOvBoxSetChild(that, &that->priv->under, that->priv->underWin, widget); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBox_SetOver -- + * + * Set the over widget of a ViewOvBox. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +void +ViewOvBox_SetOver(ViewOvBox *that, // IN + GtkWidget *widget) // IN +{ + g_return_if_fail(that != NULL); + + VIEW_OV_BOX_GET_CLASS(that)->set_over(that, widget); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBox_SetMin -- + * + * Set the 'min' property of a ViewOvBox, i.e. the number of pixel of the + * 'over' child that should always be displayed without overlapping on the + * 'under' child. + * + * Using a value of -1 displays the 'over' child entirely. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +void +ViewOvBox_SetMin(ViewOvBox *that, // IN + unsigned int min) // IN +{ + g_return_if_fail(that != NULL); + + that->priv->min = min; + gtk_widget_queue_resize(GTK_WIDGET(that)); +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBox_SetFraction -- + * + * Set the 'fraction' property of a ViewOvBox, i.e. how much of the 'over' + * child should overlap on the 'under' child. + * + * Results: + * None + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +void +ViewOvBox_SetFraction(ViewOvBox *that, // IN + double fraction) // IN +{ + g_return_if_fail(that != NULL); + g_return_if_fail(fraction >=0 && fraction <= 1); + + that->priv->fraction = fraction; + if (GTK_WIDGET_REALIZED(that)) { + int x; + int y; + int width; + int height; + + ViewOvBoxGetOverGeometry(that, &x, &y, &width, &height); + gdk_window_move(that->priv->overWin, x, y); + } +} + + +/* + *----------------------------------------------------------------------------- + * + * ViewOvBox_GetFraction -- + * + * Retrieve the 'fraction' property of a ViewOvBox. + * + * Results: + * The value + * + * Side effects: + * None + * + *----------------------------------------------------------------------------- + */ + +double +ViewOvBox_GetFraction(ViewOvBox *that) +{ + g_return_val_if_fail(that != NULL, 0); + + return that->priv->fraction; +} diff -Nru vinagre-2.26.1/vinagre/view/ovBox.h vinagre-2.29.1/vinagre/view/ovBox.h --- vinagre-2.26.1/vinagre/view/ovBox.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/view/ovBox.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,103 @@ +/* ************************************************************************* + * Copyright (c) 2005 VMware, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * *************************************************************************/ + +/* + * ovBox.h -- + * + * Declarations for the ViewOvBox GTK+ widget. + */ + + +#ifndef LIBVIEW_OVBOX_H +#define LIBVIEW_OVBOX_H + + +#include + + +#define VIEW_TYPE_OV_BOX (ViewOvBox_GetType()) +#define VIEW_OV_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VIEW_TYPE_OV_BOX, ViewOvBox)) +#define VIEW_OV_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VIEW_TYPE_OV_BOX, ViewOvBoxClass)) +#define VIEW_IS_OV_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VIEW_TYPE_OV_BOX)) +#define VIEW_IS_OV_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VIEW_TYPE_OV_BOX)) +#define VIEW_OV_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VIEW_TYPE_OV_BOX, ViewOvBoxClass)) + +typedef struct _ViewOvBoxPrivate ViewOvBoxPrivate; + +typedef struct _ViewOvBox { + /* Must come first. */ + GtkBox parent; + + /* Private. */ + ViewOvBoxPrivate *priv; +} ViewOvBox; + + +typedef struct _ViewOvBoxClass { + /* Must come first. */ + GtkBoxClass parent; + + /* Virtual methods. */ + void (* set_over)(ViewOvBox *ovBox, GtkWidget *widget); + + /* Padding for future expansion */ + void (*_view_reserved0)(void); + void (*_view_reserved1)(void); + void (*_view_reserved2)(void); + void (*_view_reserved3)(void); +} ViewOvBoxClass; + + +G_BEGIN_DECLS + + +GType +ViewOvBox_GetType(void); + +GtkWidget * +ViewOvBox_New(void); + +void +ViewOvBox_SetUnder(ViewOvBox *that, + GtkWidget *widget); + +void +ViewOvBox_SetOver(ViewOvBox *that, + GtkWidget *widget); + +void +ViewOvBox_SetMin(ViewOvBox *that, + unsigned int min); + +void +ViewOvBox_SetFraction(ViewOvBox *that, + double fraction); + +double +ViewOvBox_GetFraction(ViewOvBox *that); + + +G_END_DECLS + + +#endif /* LIBVIEW_OVBOX_H */ diff -Nru vinagre-2.26.1/vinagre/vinagre-app.c vinagre-2.29.1/vinagre/vinagre-app.c --- vinagre-2.26.1/vinagre/vinagre-app.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-app.c 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,320 @@ +/* + * vinagre-app.c + * This file is part of vinagre + * + * Copyright (C) 2008 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include "vinagre-app.h" +#include "vinagre-utils.h" + +#define VINAGRE_APP_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_APP, VinagreAppPrivate)) + + +struct _VinagreAppPrivate +{ + GList *windows; + VinagreWindow *active_window; +}; + +G_DEFINE_TYPE(VinagreApp, vinagre_app, G_TYPE_OBJECT) + +static void +vinagre_app_finalize (GObject *object) +{ + VinagreApp *app = VINAGRE_APP (object); + + g_list_free (app->priv->windows); + + G_OBJECT_CLASS (vinagre_app_parent_class)->finalize (object); +} + +static void +vinagre_app_class_init (VinagreAppClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = vinagre_app_finalize; + + g_type_class_add_private (object_class, sizeof(VinagreAppPrivate)); +} + +static gchar * +get_accel_file (void) +{ + const gchar *home; + + home = g_get_user_config_dir (); + + if (home) + return g_build_filename (home, + "vinagre", + "accels", + NULL); + return NULL; +} + +static void +load_accels (void) +{ + gchar *filename; + + filename = get_accel_file (); + if (!filename) + return; + + gtk_accel_map_load (filename); + g_free (filename); +} + +static void +save_accels (void) +{ + gchar *filename; + + filename = get_accel_file (); + if (!filename) + return; + + gtk_accel_map_save (filename); + g_free (filename); +} + +static void +vinagre_app_init (VinagreApp *app) +{ + app->priv = VINAGRE_APP_GET_PRIVATE (app); + app->priv->windows = NULL; + app->priv->active_window = NULL; + + load_accels (); +} + +static void +app_weak_notify (gpointer data, + GObject *where_the_app_was) +{ + gtk_main_quit (); +} + +VinagreApp * +vinagre_app_get_default (void) +{ + static VinagreApp *app = NULL; + + if (G_LIKELY (app)) + return app; + + app = VINAGRE_APP (g_object_new (VINAGRE_TYPE_APP, NULL)); + + g_object_add_weak_pointer (G_OBJECT (app), + (gpointer) &app); + g_object_weak_ref (G_OBJECT (app), + app_weak_notify, + NULL); + + return app; +} + +static gboolean +window_focus_in_event (VinagreWindow *window, + GdkEventFocus *event, + VinagreApp *app) +{ + /* updates active_view and active_child when a new toplevel receives focus */ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), FALSE); + + app->priv->active_window = window; + + return FALSE; +} + +static void +window_destroy (VinagreWindow *window, + VinagreApp *app) +{ + app->priv->windows = g_list_remove (app->priv->windows, + window); + + if (window == app->priv->active_window) + app->priv->active_window = app->priv->windows != NULL ? + app->priv->windows->data : NULL; + + if (app->priv->windows == NULL) + { + save_accels (); + g_object_unref (app); + } +} + +VinagreWindow * +vinagre_app_create_window (VinagreApp *app, GdkScreen *screen) +{ + VinagreWindow *window; + + /* + * We need to be careful here, there is a race condition: + * when another vinagre is launched it checks active_window, + * so we must do our best to ensure that active_window + * is never NULL when at least a window exists. + */ + if (app->priv->windows == NULL) + app->priv->active_window = window = vinagre_window_new (); + else + window = vinagre_window_new (); + + app->priv->windows = g_list_prepend (app->priv->windows, + window); + + g_signal_connect (window, + "focus_in_event", + G_CALLBACK (window_focus_in_event), + app); + g_signal_connect (window, + "destroy", + G_CALLBACK (window_destroy), + app); + + if (screen != NULL) + gtk_window_set_screen (GTK_WINDOW (window), screen); + + return window; +} + +const GList * +vinagre_app_get_windows (VinagreApp *app) +{ + g_return_val_if_fail (VINAGRE_IS_APP (app), NULL); + + return app->priv->windows; +} + +VinagreWindow * +vinagre_app_get_active_window (VinagreApp *app) +{ + g_return_val_if_fail (VINAGRE_IS_APP (app), NULL); + + /* make sure our active window is always realized: + * this is needed on startup if we launch two vinagre fast + * enough that the second instance comes up before the + * first one shows its window. + */ + + if (!GTK_WIDGET_REALIZED (GTK_WIDGET (app->priv->active_window))) + gtk_widget_realize (GTK_WIDGET (app->priv->active_window)); + + return app->priv->active_window; +} + +static gboolean +is_in_viewport (VinagreWindow *window, + GdkScreen *screen, + gint workspace, + gint viewport_x, + gint viewport_y) +{ + GdkScreen *s; + GdkDisplay *display; + const gchar *cur_name; + const gchar *name; + gint cur_n; + gint n; + gint ws; + gint sc_width, sc_height; + gint x, y, width, height; + gint vp_x, vp_y; + + /* Check for screen and display match */ + display = gdk_screen_get_display (screen); + cur_name = gdk_display_get_name (display); + cur_n = gdk_screen_get_number (screen); + + s = gtk_window_get_screen (GTK_WINDOW (window)); + display = gdk_screen_get_display (s); + name = gdk_display_get_name (display); + n = gdk_screen_get_number (s); + + if (strcmp (cur_name, name) != 0 || cur_n != n) + return FALSE; + + /* Check for workspace match */ + ws = vinagre_utils_get_window_workspace (GTK_WINDOW (window)); + if (ws != workspace && ws != VINAGRE_ALL_WORKSPACES) + return FALSE; + + /* Check for viewport match */ + gdk_window_get_position (GTK_WIDGET (window)->window, &x, &y); + gdk_drawable_get_size (GTK_WIDGET (window)->window, &width, &height); + vinagre_utils_get_current_viewport (screen, &vp_x, &vp_y); + x += vp_x; + y += vp_y; + + sc_width = gdk_screen_get_width (screen); + sc_height = gdk_screen_get_height (screen); + + return x + width * .25 >= viewport_x && + x + width * .75 < viewport_x + sc_width && + y >= viewport_y && + y + height < viewport_y + sc_height; +} + +VinagreWindow * +vinagre_app_get_window_in_viewport (VinagreApp *app, + GdkScreen *screen, + gint workspace, + gint viewport_x, + gint viewport_y) +{ + VinagreWindow *window; + GList *l; + + g_return_val_if_fail (VINAGRE_IS_APP (app), NULL); + + /* first try if the active window */ + window = app->priv->active_window; + + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + if (is_in_viewport (window, screen, workspace, viewport_x, viewport_y)) + return window; + + /* otherwise try to see if there is a window on this workspace */ + for (l = app->priv->windows; l != NULL; l = l->next) + { + window = l->data; + + if (is_in_viewport (window, screen, workspace, viewport_x, viewport_y)) + return window; + } + + /* no window on this workspace... create a new one */ + return vinagre_app_create_window (app, screen); +} + +GList * +vinagre_app_get_connections (VinagreApp *app) +{ + return NULL; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-app.h vinagre-2.29.1/vinagre/vinagre-app.h --- vinagre-2.26.1/vinagre/vinagre-app.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-app.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,74 @@ +/* + * vinagre-app.h + * This file is part of vinagre + * + * Copyright (C) 2008 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_APP_H__ +#define __VINAGRE_APP_H__ + +#include + +#include "vinagre-window.h" + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_APP (vinagre_app_get_type()) +#define VINAGRE_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_APP, VinagreApp)) +#define VINAGRE_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_APP, VinagreAppClass)) +#define VINAGRE_IS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_APP)) +#define VINAGRE_IS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_APP)) +#define VINAGRE_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_APP, VinagreAppClass)) + +typedef struct _VinagreAppPrivate VinagreAppPrivate; +typedef struct _VinagreApp VinagreApp; +typedef struct _VinagreAppClass VinagreAppClass; + +struct _VinagreApp +{ + GObject object; + VinagreAppPrivate *priv; +}; + + +struct _VinagreAppClass +{ + GObjectClass parent_class; +}; + + +GType vinagre_app_get_type (void) G_GNUC_CONST; + +VinagreApp *vinagre_app_get_default (void); + +VinagreWindow *vinagre_app_create_window (VinagreApp *app, + GdkScreen *screen); + +const GList *vinagre_app_get_windows (VinagreApp *app); +VinagreWindow *vinagre_app_get_active_window (VinagreApp *app); +GList *vinagre_app_get_connections (VinagreApp *app); + +VinagreWindow *vinagre_app_get_window_in_viewport (VinagreApp *app, + GdkScreen *screen, + gint workspace, + gint viewport_x, + gint viewport_y); + +G_END_DECLS + +#endif /* __VINAGRE_APP_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-applet.c vinagre-2.29.1/vinagre/vinagre-applet.c --- vinagre-2.26.1/vinagre/vinagre-applet.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-applet.c 2009-08-06 13:55:40.000000000 +0100 @@ -0,0 +1,503 @@ +/* + * vinagre-applet.c + * This file is part of vinagre + * + * Copyright (C) 2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +#include "vinagre-bookmarks.h" +#include "vinagre-bookmarks-entry.h" +#include "vinagre-utils.h" +#include "vinagre-connection.h" +#include "vinagre-commands.h" +#include "vinagre-plugin.h" +#include "vinagre-plugins-engine.h" + +#include + +#ifdef VINAGRE_ENABLE_AVAHI +#include "vinagre-mdns.h" +#endif + +#define VINAGRE_TYPE_APPLET (vinagre_applet_get_type ()) +#define VINAGRE_APPLET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), VINAGRE_TYPE_APPLET, VinagreApplet)) +#define VINAGRE_APPLET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), VINAGRE_TYPE_APPLET, VinagreAppletClass)) +#define VINAGRE_IS_APPLET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), VINAGRE_TYPE_APPLET)) +#define VINAGRE_IS_APPLET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), VINAGRE_TYPE_APPLET)) +#define VINAGRE_APPLET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), VINAGRE_TYPE_APPLET, VinagreAppletClass)) + +#define VINAGRE_APPLET_OAFID "OAFIID:GNOME_VinagreApplet" +#define VINAGRE_APPLET_FACTORY_OAFID "OAFIID:GNOME_VinagreApplet_Factory" +#define PANEL_APPLET_VERTICAL(p) (((p) == PANEL_APPLET_ORIENT_LEFT) || ((p) == PANEL_APPLET_ORIENT_RIGHT)) + +typedef struct{ + PanelApplet parent; + GdkPixbuf *icon; + gint icon_width, icon_height, size; +} VinagreApplet; + +typedef struct{ + PanelAppletClass parent_class; +} VinagreAppletClass; + +GType vinagre_applet_get_type (void); +static void vinagre_applet_class_init (VinagreAppletClass *klass); +static void vinagre_applet_init (VinagreApplet *applet); + +static void vinagre_applet_get_icon (VinagreApplet *applet); +static void vinagre_applet_check_size (VinagreApplet *applet); +static gboolean vinagre_applet_draw_cb (VinagreApplet *applet); +static void vinagre_applet_update_tooltip (VinagreApplet *applet); +static void vinagre_applet_dialog_about_cb (BonoboUIComponent *uic, gpointer data, const gchar *verbname); +static gboolean vinagre_applet_bonobo_cb (PanelApplet *_applet, const gchar *iid, gpointer data); +static void vinagre_applet_destroy_cb (GtkObject *object); + +G_DEFINE_TYPE (VinagreApplet, vinagre_applet, PANEL_TYPE_APPLET) + +static void +vinagre_applet_get_icon (VinagreApplet *applet) +{ + if (applet->icon != NULL) + { + g_object_unref (applet->icon); + applet->icon = NULL; + } + + if (applet->size <= 2) + return; + + applet->icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), + "vinagre", + applet->size - 2, + 0, + NULL); + + applet->icon_height = gdk_pixbuf_get_height (applet->icon); + applet->icon_width = gdk_pixbuf_get_width (applet->icon); +} + +static void +vinagre_applet_check_size (VinagreApplet *applet) +{ + /* we don't use the size function here, but the yet allocated size because the + size value is false (kind of rounded) */ + if (PANEL_APPLET_VERTICAL(panel_applet_get_orient (PANEL_APPLET (applet)))) + { + if (applet->size != GTK_WIDGET(applet)->allocation.width) + { + applet->size = GTK_WIDGET(applet)->allocation.width; + vinagre_applet_get_icon (applet); + gtk_widget_set_size_request (GTK_WIDGET(applet), applet->size, applet->icon_height + 2); + } + + /* Adjusting in case the icon size has changed */ + if (GTK_WIDGET(applet)->allocation.height < applet->icon_height + 2) + { + gtk_widget_set_size_request (GTK_WIDGET(applet), applet->size, applet->icon_height + 2); + } + } + else + { + if (applet->size != GTK_WIDGET(applet)->allocation.height) + { + applet->size = GTK_WIDGET(applet)->allocation.height; + vinagre_applet_get_icon (applet); + gtk_widget_set_size_request (GTK_WIDGET(applet), applet->icon_width + 2, applet->size); + } + + /* Adjusting in case the icon size has changed */ + if (GTK_WIDGET(applet)->allocation.width < applet->icon_width + 2) + { + gtk_widget_set_size_request (GTK_WIDGET(applet), applet->icon_width + 2, applet->size); + } + } +} + +static gboolean +vinagre_applet_draw_cb (VinagreApplet *applet) +{ + gint w, h, bg_type; + GdkColor color; + GdkGC *gc; + GdkPixmap *background; + + if (GTK_WIDGET (applet)->window == NULL) + return FALSE; + + /* Clear the window so we can draw on it later */ + gdk_window_clear (GTK_WIDGET(applet)->window); + + /* retrieve applet size */ + vinagre_applet_get_icon (applet); + vinagre_applet_check_size (applet); + if (applet->size <= 2) + return FALSE; + + /* if no icon, then don't try to display */ + if (applet->icon == NULL) + return FALSE; + + w = GTK_WIDGET(applet)->allocation.width; + h = GTK_WIDGET(applet)->allocation.height; + + gc = gdk_gc_new (GTK_WIDGET(applet)->window); + + /* draw pixmap background */ + bg_type = panel_applet_get_background (PANEL_APPLET (applet), &color, &background); + if (bg_type == PANEL_PIXMAP_BACKGROUND) + { + /* fill with given background pixmap */ + gdk_draw_drawable (GTK_WIDGET(applet)->window, gc, background, 0, 0, 0, 0, w, h); + } + + /* draw color background */ + if (bg_type == PANEL_COLOR_BACKGROUND) + { + gdk_gc_set_rgb_fg_color (gc,&color); + gdk_gc_set_fill (gc,GDK_SOLID); + gdk_draw_rectangle (GTK_WIDGET(applet)->window, gc, TRUE, 0, 0, w, h); + } + + /* draw icon at center */ + gdk_draw_pixbuf (GTK_WIDGET(applet)->window, gc, applet->icon, + 0, 0, (w - applet->icon_width)/2, (h - applet->icon_height)/2, + applet->icon_width, applet->icon_height, + GDK_RGB_DITHER_NONE, 0, 0); + + return TRUE; +} + +static void +vinagre_applet_change_background_cb (VinagreApplet *applet, + PanelAppletBackgroundType arg1, + GdkColor *arg2, GdkPixmap *arg3, gpointer data) +{ + gtk_widget_queue_draw (GTK_WIDGET (applet)); +} + +static void +vinagre_applet_destroy_cb (GtkObject *object) +{ + VinagreApplet *applet = VINAGRE_APPLET (object); + + if (applet->icon != NULL) + g_object_unref (applet->icon); +} + +static void +vinagre_applet_class_init (VinagreAppletClass *klass) +{ + /* nothing to do here */ +} + +static void +menu_position (GtkMenu *menu, + gint *x, + gint *y, + gboolean *push_in, + GtkWidget *applet) +{ + int applet_height, applet_width; + GtkRequisition requisition; + + gdk_window_get_origin (applet->window, x, y); + gdk_drawable_get_size (applet->window, &applet_width, &applet_height); + gtk_widget_size_request (GTK_WIDGET (menu), &requisition); + + switch (panel_applet_get_orient (PANEL_APPLET (applet))) + { + case PANEL_APPLET_ORIENT_DOWN: + *y += applet_height + 1; + break; + + case PANEL_APPLET_ORIENT_UP: + *y = MAX (*y - requisition.height - 2, 2*applet_height); + break; + + case PANEL_APPLET_ORIENT_LEFT: + *x = MAX (*x - requisition.width - 2, 2*applet_width); + break; + + case PANEL_APPLET_ORIENT_RIGHT: + *x += applet_height + 1; + break; + + default: + g_assert_not_reached (); + } + + *push_in = TRUE; +} + +static void +open_connection_cb (GtkMenuItem *item, + gpointer *user_data) +{ + GError *err = NULL; + gchar **argv; + VinagreConnection *conn; + + conn = VINAGRE_CONNECTION (g_object_get_data (G_OBJECT (item), "conn")); + + argv = g_new0 (gchar *, 3); + argv[0] = g_strdup ("vinagre"); + argv[1] = g_strdup (vinagre_connection_get_string_rep (conn, TRUE)); + argv[2] = NULL; + + if (!gdk_spawn_on_screen (gtk_widget_get_screen (GTK_WIDGET (item)), + NULL, + argv, + NULL, + G_SPAWN_SEARCH_PATH, + NULL, + NULL, + NULL, + &err)) + { + vinagre_utils_show_error (_("Could not run vinagre:"), err->message, NULL); + g_error_free (err); + } + + g_strfreev (argv); +} + +static void +fill_recursive_menu (GSList *entries, GtkWidget *menu) +{ + GSList *l; + GtkWidget *item, *image, *child; + + for (l = entries; l; l = l->next) + { + VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (l->data); + VinagreConnection *conn; + VinagrePlugin *plugin; + + switch (vinagre_bookmarks_entry_get_node (entry)) + { + case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: + image = gtk_image_new_from_icon_name ("folder", GTK_ICON_SIZE_MENU); + item = gtk_image_menu_item_new_with_label (vinagre_bookmarks_entry_get_name (entry)); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), + image); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), + item); + + child = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), child); + + fill_recursive_menu (vinagre_bookmarks_entry_get_children (entry), + child); + break; + + case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: + conn = vinagre_bookmarks_entry_get_conn (entry); + plugin = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), + vinagre_connection_get_protocol (conn)); + + image = gtk_image_new_from_icon_name (vinagre_plugin_get_icon_name (plugin), + GTK_ICON_SIZE_MENU); + item = gtk_image_menu_item_new_with_label (vinagre_connection_get_name (conn)); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), + image); + + gtk_menu_shell_append (GTK_MENU_SHELL (menu), + item); + g_object_set_data (G_OBJECT (item), "conn", conn); + g_signal_connect (item, "activate", G_CALLBACK (open_connection_cb), NULL); + break; + + default: + g_assert_not_reached (); + } + } + +} + +static void +fill_menu (GSList *all, GtkWidget *menu) +{ + GtkWidget *item, *image; + + if (g_slist_length (all) == 0) + return; + + /* Separator */ + item = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + fill_recursive_menu (all, menu); +} + +static void +open_vinagre_cb (GtkMenuItem *item, + gpointer *user_data) +{ + GError *err = NULL; + + if (!g_spawn_command_line_async ("vinagre", &err)) + { + vinagre_utils_show_error (_("Could not run vinagre:"), err->message, NULL); + g_error_free (err); + } +} + +static gboolean +vinagre_applet_click_cb (GtkWidget *applet, + GdkEventButton *event, + gpointer user_data) +{ + GtkWidget *menu, *item, *image; + GSList *all; + + if ((event->type != GDK_BUTTON_PRESS) || (event->button != 1)) + return FALSE; + + menu = gtk_menu_new (); + + /* Open, first item */ + image = gtk_image_new_from_icon_name ("vinagre", GTK_ICON_SIZE_MENU); + item = gtk_image_menu_item_new_with_label (_("Open Remote Desktop Viewer")); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), + image); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + g_signal_connect (item, "activate", G_CALLBACK (open_vinagre_cb), NULL); + + all = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()); + fill_menu (all, menu); + +#ifdef VINAGRE_ENABLE_AVAHI + all = vinagre_mdns_get_all (vinagre_mdns_get_default ()); + fill_menu (all, menu); +#endif + + gtk_widget_show_all (menu); + gtk_menu_popup (GTK_MENU (menu), NULL, NULL, (GtkMenuPositionFunc) menu_position, applet, + event->button, event->time); + return TRUE; +} + +static void +vinagre_applet_help_cb (BonoboUIComponent *ui_container, + gpointer data, + const gchar *cname) +{ + vinagre_utils_help_contents (NULL); +} + +static void +vinagre_applet_about_cb (BonoboUIComponent *ui_container, + gpointer data, + const gchar *cname) +{ + vinagre_utils_help_about (NULL); +} + + +static void +vinagre_applet_init (VinagreApplet *applet) +{ + gchar *tmp; +#ifdef VINAGRE_ENABLE_AVAHI + VinagreMdns *mdns; +#endif + + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + + applet->size = 0; + applet->icon = NULL; + + tmp = g_strdup_printf ("%s\n%s", + _("Remote Desktop Viewer"), + _("Access your bookmarks")); + gtk_widget_set_tooltip_text (GTK_WIDGET (applet), tmp); + g_free (tmp); + + panel_applet_set_flags (PANEL_APPLET (applet), PANEL_APPLET_EXPAND_MINOR); + gtk_widget_show_all (GTK_WIDGET(applet)); + vinagre_applet_draw_cb (applet); + + g_signal_connect (G_OBJECT (applet), "button-press-event", + G_CALLBACK (vinagre_applet_click_cb), NULL); + + g_signal_connect (G_OBJECT (applet), "expose-event", + G_CALLBACK (vinagre_applet_draw_cb), NULL); + + /* We use g_signal_connect_after because letting the panel draw + * the background is the only way to have the correct + * background when a theme defines a background picture. */ + g_signal_connect_after (G_OBJECT (applet), "expose-event", + G_CALLBACK (vinagre_applet_draw_cb), NULL); + + g_signal_connect (G_OBJECT (applet), "change-background", + G_CALLBACK (vinagre_applet_change_background_cb), NULL); + + g_signal_connect (G_OBJECT (applet), "change-orient", + G_CALLBACK (vinagre_applet_draw_cb), NULL); + + g_signal_connect (G_OBJECT (applet), "destroy", + G_CALLBACK (vinagre_applet_destroy_cb), NULL); + +#ifdef VINAGRE_ENABLE_AVAHI + mdns = vinagre_mdns_get_default (); +#endif +} + +static gboolean +vinagre_applet_fill (PanelApplet *_applet, + const gchar *iid, + gpointer data) +{ + VinagreApplet *applet = VINAGRE_APPLET (_applet); + + static const BonoboUIVerb menu_verbs[] = { + BONOBO_UI_VERB ("VinagreHelp", vinagre_applet_help_cb), + BONOBO_UI_VERB ("VinagreAbout", vinagre_applet_about_cb), + BONOBO_UI_VERB_END + }; + + if (strcmp (iid, VINAGRE_APPLET_OAFID) != 0) + return FALSE; + + gtk_window_set_default_icon_name ("vinagre"); + g_set_application_name (_("Remote Desktop Viewer")); + + panel_applet_setup_menu_from_file (_applet, + NULL, + DATADIR "/vinagre/GNOME_VinagreApplet.xml", + NULL, menu_verbs, applet); + vinagre_applet_draw_cb (applet); + return TRUE; +} + +PANEL_APPLET_BONOBO_FACTORY (VINAGRE_APPLET_FACTORY_OAFID, + VINAGRE_TYPE_APPLET, + "VinagreApplet", + VERSION, + vinagre_applet_fill, + NULL); + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bacon.c vinagre-2.29.1/vinagre/vinagre-bacon.c --- vinagre-2.26.1/vinagre/vinagre-bacon.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bacon.c 2009-08-10 14:58:06.000000000 +0100 @@ -0,0 +1,296 @@ +/* + * vinagre-bacon.c + * This file is part of vinagre + * + * Copyright (C) 2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "bacon-message-connection.h" +#include "vinagre-utils.h" +#include "vinagre-connection.h" +#include "vinagre-app.h" +#include "vinagre-window.h" +#include "vinagre-commands.h" + +static guint32 startup_timestamp = 0; + +static GdkDisplay * +display_open_if_needed (const gchar *name) +{ + GSList *displays; + GSList *l; + GdkDisplay *display = NULL; + + displays = gdk_display_manager_list_displays (gdk_display_manager_get ()); + + for (l = displays; l != NULL; l = l->next) + { + if (strcmp (gdk_display_get_name ((GdkDisplay *) l->data), name) == 0) + { + display = l->data; + break; + } + } + + g_slist_free (displays); + + return display != NULL ? display : gdk_display_open (name); +} + +/* serverside */ +void +vinagre_bacon_message_received (const char *message, + gpointer data) +{ + gchar **commands; + gchar **params; + gint workspace; + gint viewport_x; + gint viewport_y; + gchar *display_name; + gint screen_number; + gint i; + VinagreApp *app; + VinagreWindow *window; + GdkDisplay *display; + GdkScreen *screen; + gboolean new_window = FALSE; + GSList *servers = NULL; + GSList *l, *next; + VinagreConnection *conn; + gchar *error; + + g_return_if_fail (message != NULL); + + commands = g_strsplit (message, "\v", -1); + + /* header */ + params = g_strsplit (commands[0], "\t", 6); + startup_timestamp = atoi (params[0]); + display_name = params[1]; + screen_number = atoi (params[2]); + workspace = atoi (params[3]); + viewport_x = atoi (params[4]); + viewport_y = atoi (params[5]); + + display = display_open_if_needed (display_name); + if (display == NULL) + { + g_warning ("Could not open display %s\n", display_name); + g_strfreev (params); + goto out; + } + + screen = gdk_display_get_screen (display, screen_number); + g_strfreev (params); + + /* body */ + for (i = 1; commands[i] != NULL; i++) + { + params = g_strsplit (commands[i], "\t", -1); + + if (strcmp (params[0], "NEW-WINDOW") == 0) + new_window = TRUE; + + else if (strcmp (params[0], "OPEN-URIS") == 0) + { + gint n_uris, j; + gchar **uris; + + n_uris = atoi (params[1]); + uris = g_strsplit (params[2], " ", n_uris); + + for (j = 0; j < n_uris; j++) + { + conn = vinagre_connection_new_from_string (uris[j], &error, TRUE); + if (conn) + servers = g_slist_prepend (servers, conn); + else + /*FIXME: Show a dialog error?*/ + g_free (error); + } + + g_strfreev (uris); + } + + else + { + g_warning ("Unexpected bacon command"); + } + + g_strfreev (params); + } + + /* execute the commands */ + app = vinagre_app_get_default (); + if (new_window) + window = vinagre_app_create_window (app, screen); + else + /* get a window in the current workspace (if exists) and raise it */ + window = vinagre_app_get_window_in_viewport (app, + screen, + workspace, + viewport_x, + viewport_y); + + for (l = servers; l; l = next) + { + VinagreConnection *conn = l->data; + + next = l->next; + vinagre_cmd_direct_connect (conn, window); + g_object_unref (conn); + } + g_slist_free (servers); + + /* set the proper interaction time on the window. + * Fall back to roundtripping to the X server when we + * don't have the timestamp, e.g. when launched from + * terminal. We also need to make sure that the window + * has been realized otherwise it will not work. lame. + */ + if (!GTK_WIDGET_REALIZED (window)) + gtk_widget_realize (GTK_WIDGET (window)); + + if (startup_timestamp <= 0) + startup_timestamp = gdk_x11_get_server_time (GTK_WIDGET (window)->window); + + gdk_x11_window_set_user_time (GTK_WIDGET (window)->window, + startup_timestamp); + gtk_window_present (GTK_WINDOW (window)); + + out: + g_strfreev (commands); +} + +/* clientside */ +static void +vinagre_bacon_send_message (BaconMessageConnection *connection, + GSList *servers, + gboolean new_window) +{ + GdkScreen *screen; + GdkDisplay *display; + const gchar *display_name; + gint screen_number; + gint ws; + gint viewport_x; + gint viewport_y; + GString *command; + + /* the messages have the following format: + * <--- header ---> <---- body -----> + * timestamp \t display_name \t screen_number \t workspace \t viewport_x \t viewport_y \v OP1 \t arg \t arg \v OP2 \t arg \t arg|... + * + * when the arg is a list of uri, they are separated by a space. + * So the delimiters are \v for the commands, \t for the tokens in + * a command and ' ' for the uris: note that such delimiters cannot + * be part of an uri, this way parsing is easier. + */ + + screen = gdk_screen_get_default (); + display = gdk_screen_get_display (screen); + + display_name = gdk_display_get_name (display); + screen_number = gdk_screen_get_number (screen); + + ws = vinagre_utils_get_current_workspace (screen); + vinagre_utils_get_current_viewport (screen, &viewport_x, &viewport_y); + + command = g_string_new (NULL); + + /* header */ + g_string_append_printf (command, + "%" G_GUINT32_FORMAT "\t%s\t%d\t%d\t%d\t%d", + startup_timestamp, + display_name, + screen_number, + ws, + viewport_x, + viewport_y); + + /* NEW-WINDOW command */ + if (new_window) + { + command = g_string_append_c (command, '\v'); + command = g_string_append (command, "NEW-WINDOW"); + } + + /* OPEN_URIS command */ + if (servers) + { + GSList *l; + + command = g_string_append_c (command, '\v'); + command = g_string_append (command, "OPEN-URIS"); + + g_string_append_printf (command, "\t%d\t", g_slist_length (servers)); + + for (l = servers; l != NULL; l = l->next) + { + VinagreConnection *conn = l->data; + gchar *uri = vinagre_connection_get_string_rep (conn, TRUE); + + g_string_append (command, uri); + g_free (uri); + + if (l->next != NULL) + command = g_string_append_c (command, ' '); + } + } + + bacon_message_connection_send (connection, + command->str); + + g_string_free (command, TRUE); +} + +void +vinagre_bacon_start (GSList *servers, gboolean new_window) +{ + BaconMessageConnection *connection; + + connection = bacon_message_connection_new ("vinagre"); + if (!connection) + { + g_warning ("Cannot create the 'vinagre' connection."); + return; + } + + if (!bacon_message_connection_get_is_server (connection)) + { + vinagre_bacon_send_message (connection, servers, new_window); + + gdk_notify_startup_complete (); + + g_slist_foreach (servers, (GFunc) g_object_unref, NULL); + g_slist_free (servers); + bacon_message_connection_free (connection); + + exit (0); + } + else + { + bacon_message_connection_set_callback (connection, + vinagre_bacon_message_received, + NULL); + } +} +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bacon.h vinagre-2.29.1/vinagre/vinagre-bacon.h --- vinagre-2.26.1/vinagre/vinagre-bacon.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bacon.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * vinagre-bacon.h + * This file is part of vinagre + * + * Copyright (C) 2008 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_BACON_H__ +#define __VINAGRE_BACON_H__ + +void vinagre_bacon_start (GSList *servers, gboolean new_window); + +#endif /* __VINAGRE_BACON_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks.c vinagre-2.29.1/vinagre/vinagre-bookmarks.c --- vinagre-2.26.1/vinagre/vinagre-bookmarks.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks.c 2009-07-27 12:59:31.000000000 +0100 @@ -0,0 +1,556 @@ +/* + * vinagre-bookmarks.c + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include + +#include "vinagre-bookmarks.h" +#include "vinagre-bookmarks-entry.h" +#include "vinagre-bookmarks-migration.h" +#include "vinagre-connection.h" +#include "vinagre-plugin.h" +#include "vinagre-plugins-engine.h" + +struct _VinagreBookmarksPrivate +{ + gchar *filename; + GSList *entries; + GFileMonitor *monitor; +}; + +enum +{ + BOOKMARK_CHANGED, + LAST_SIGNAL +}; + +G_DEFINE_TYPE (VinagreBookmarks, vinagre_bookmarks, G_TYPE_OBJECT); + +static VinagreBookmarks *book_singleton = NULL; +static guint signals[LAST_SIGNAL] = { 0 }; + +/* Prototypes */ +static void vinagre_bookmarks_update_from_file (VinagreBookmarks *book); +static void vinagre_bookmarks_file_changed (GFileMonitor *monitor, + GFile *file, + GFile *other_file, + GFileMonitorEvent event_type, + VinagreBookmarks *book); + +static void +vinagre_bookmarks_init (VinagreBookmarks *book) +{ + GFile *gfile; + + book->priv = G_TYPE_INSTANCE_GET_PRIVATE (book, VINAGRE_TYPE_BOOKMARKS, VinagreBookmarksPrivate); + book->priv->entries = NULL; + book->priv->filename = g_build_filename (g_get_user_data_dir (), + "vinagre", + VINAGRE_BOOKMARKS_FILE, + NULL); + + if (!g_file_test (book->priv->filename, G_FILE_TEST_EXISTS)) + vinagre_bookmarks_migration_migrate (book->priv->filename); + + vinagre_bookmarks_update_from_file (book); + + gfile = g_file_new_for_path (book->priv->filename); + book->priv->monitor = g_file_monitor_file (gfile, + G_FILE_MONITOR_NONE, + NULL, + NULL); + g_object_unref (gfile); + + g_signal_connect (book->priv->monitor, + "changed", + G_CALLBACK (vinagre_bookmarks_file_changed), + book); +} + +static void +vinagre_bookmarks_clear_entries (VinagreBookmarks *book) +{ + g_slist_foreach (book->priv->entries, (GFunc) g_object_unref, NULL); + g_slist_free (book->priv->entries); + + book->priv->entries = NULL; +} + +static void +vinagre_bookmarks_finalize (GObject *object) +{ + VinagreBookmarks *book = VINAGRE_BOOKMARKS (object); + + g_free (book->priv->filename); + book->priv->filename = NULL; + + G_OBJECT_CLASS (vinagre_bookmarks_parent_class)->finalize (object); +} + +static void +vinagre_bookmarks_dispose (GObject *object) +{ + VinagreBookmarks *book = VINAGRE_BOOKMARKS (object); + + if (book->priv->entries) + vinagre_bookmarks_clear_entries (book); + + if (book->priv->monitor) + { + g_file_monitor_cancel (book->priv->monitor); + g_object_unref (book->priv->monitor); + book->priv->monitor = NULL; + } + + G_OBJECT_CLASS (vinagre_bookmarks_parent_class)->dispose (object); +} + +static void +vinagre_bookmarks_class_init (VinagreBookmarksClass *klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (VinagreBookmarksPrivate)); + + object_class->finalize = vinagre_bookmarks_finalize; + object_class->dispose = vinagre_bookmarks_dispose; + + signals[BOOKMARK_CHANGED] = + g_signal_new ("changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (VinagreBookmarksClass, changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); +} + +static VinagreConnection * +find_conn_by_host (GSList *entries, + const gchar *protocol, + const gchar *host, + gint port) +{ + GSList *l; + VinagreConnection *conn; + + for (l = entries; l; l = l->next) + { + VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (l->data); + + switch (vinagre_bookmarks_entry_get_node (entry)) + { + case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: + if ((conn = find_conn_by_host (vinagre_bookmarks_entry_get_children (entry), + protocol, + host, + port))) + return conn; + break; + + case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: + conn = vinagre_bookmarks_entry_get_conn (entry); + if ( (g_str_equal (host, vinagre_connection_get_host (conn))) && + (port == vinagre_connection_get_port (conn)) && + (g_str_equal (protocol, vinagre_connection_get_protocol (conn))) ) + return g_object_ref (conn); + break; + + default: + g_assert_not_reached (); + } + } + return NULL; +} + +VinagreConnection * +vinagre_bookmarks_exists (VinagreBookmarks *book, + const gchar *protocol, + const gchar *host, + gint port) +{ + VinagreConnection *conn = NULL; + GSList *l, *next; + + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS (book), NULL); + g_return_val_if_fail (host != NULL, NULL); + + return find_conn_by_host (book->priv->entries, protocol, host, port); +} + +static void +vinagre_bookmarks_save_fill_xml (GSList *list, xmlTextWriter *writer) +{ + GSList *l; + VinagreBookmarksEntry *entry; + VinagreConnection *conn; + + for (l = list; l; l = l->next) + { + entry = (VinagreBookmarksEntry *) l->data; + switch (vinagre_bookmarks_entry_get_node (entry)) + { + case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: + xmlTextWriterStartElement (writer, "folder"); + xmlTextWriterWriteAttribute (writer, "name", vinagre_bookmarks_entry_get_name (entry)); + + vinagre_bookmarks_save_fill_xml (vinagre_bookmarks_entry_get_children (entry), writer); + xmlTextWriterEndElement (writer); + break; + + case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: + conn = vinagre_bookmarks_entry_get_conn (entry); + + xmlTextWriterStartElement (writer, "item"); + vinagre_connection_fill_writer (conn, writer); + xmlTextWriterEndElement (writer); + break; + + default: + g_assert_not_reached (); + } + } +} + +static VinagreBookmarksEntry * +vinagre_bookmarks_parse_item (xmlNode *root) +{ + VinagreBookmarksEntry *entry = NULL; + VinagreConnection *conn; + xmlNode *curr; + xmlChar *s_value; + gchar *protocol = NULL; + VinagrePlugin *plugin; + + /* Loop to discover the protocol */ + for (curr = root->children; curr; curr = curr->next) + { + if (xmlStrcmp(curr->name, (const xmlChar *)"protocol")) + continue; + + s_value = xmlNodeGetContent (curr); + protocol = g_strdup ((const gchar *)s_value); + xmlFree (s_value); + break; + } + + if (!protocol) + protocol = g_strdup ("vnc"); + + plugin = g_hash_table_lookup (vinagre_plugin_engine_get_plugins_by_protocol (vinagre_plugins_engine_get_default ()), + protocol); + if (!plugin) + { + g_warning (_("The protocol %s is not supported."), protocol); + goto out; + } + + conn = vinagre_plugin_new_connection (plugin); + vinagre_connection_parse_item (conn, root); + + if (vinagre_connection_get_host (conn)) + entry = vinagre_bookmarks_entry_new_conn (conn); + + g_object_unref (conn); + +out: + g_free (protocol); + return entry; +} + +static void +vinagre_bookmarks_parse_xml (VinagreBookmarks *book, xmlNode *root, VinagreBookmarksEntry *parent_entry) +{ + xmlNode *curr; + xmlChar *folder_name; + VinagreBookmarksEntry *entry; + + for (curr = root; curr; curr = curr->next) + { + if (curr->type == XML_ELEMENT_NODE) + { + if (!xmlStrcmp(curr->name, (const xmlChar *)"folder")) + { + folder_name = xmlGetProp (curr, (const xmlChar *)"name"); + if (folder_name && *folder_name) + { + entry = vinagre_bookmarks_entry_new_folder ((const gchar *) folder_name); + if (parent_entry) + vinagre_bookmarks_entry_add_child (parent_entry, entry); + else + book->priv->entries = g_slist_insert_sorted (book->priv->entries, + entry, + (GCompareFunc)vinagre_bookmarks_entry_compare); + + vinagre_bookmarks_parse_xml (book, curr->children, entry); + } + xmlFree (folder_name); + } + else if (!xmlStrcmp(curr->name, (const xmlChar *)"item")) + { + entry = vinagre_bookmarks_parse_item (curr); + if (entry) + { + if (parent_entry) + vinagre_bookmarks_entry_add_child (parent_entry, entry); + else + book->priv->entries = g_slist_insert_sorted (book->priv->entries, + entry, + (GCompareFunc)vinagre_bookmarks_entry_compare); + } + } + } + } + +} + +static void +vinagre_bookmarks_update_from_file (VinagreBookmarks *book) +{ + xmlErrorPtr error; + xmlNodePtr root; + xmlDocPtr doc; + + if (!g_file_test (book->priv->filename, G_FILE_TEST_EXISTS)) + return; + + doc = xmlReadFile (book->priv->filename, NULL, XML_PARSE_NOERROR); + + if (!doc) + { + error = xmlGetLastError (); + g_warning (_("Error while initializing bookmarks: %s"), error?error->message: _("Unknown error")); + return; + } + + root = xmlDocGetRootElement (doc); + if (!root) + { + g_warning (_("Error while initializing bookmarks: The file seems to be empty")); + xmlFreeDoc (doc); + return; + } + + if (xmlStrcmp (root->name, (const xmlChar *) "vinagre-bookmarks")) + { + g_warning (_("Error while initializing bookmarks: The file is not a vinagre bookmarks file")); + xmlFreeDoc (doc); + return; + } + + vinagre_bookmarks_clear_entries (book); + vinagre_bookmarks_parse_xml (book, root->xmlChildrenNode, NULL); + xmlFreeDoc (doc); +} + + +static void +vinagre_bookmarks_file_changed (GFileMonitor *monitor, + GFile *file, + GFile *other_file, + GFileMonitorEvent event_type, + VinagreBookmarks *book) +{ + if (event_type != G_FILE_MONITOR_EVENT_CHANGED && + event_type != G_FILE_MONITOR_EVENT_CREATED && + event_type != G_FILE_MONITOR_EVENT_DELETED) + return; + + vinagre_bookmarks_update_from_file (book); + + g_signal_emit (book, signals[BOOKMARK_CHANGED], 0); +} + +/* Public API */ + +VinagreBookmarks * +vinagre_bookmarks_get_default (void) +{ + if (G_UNLIKELY (!book_singleton)) + book_singleton = VINAGRE_BOOKMARKS (g_object_new (VINAGRE_TYPE_BOOKMARKS, + NULL)); + return book_singleton; +} + +GSList * +vinagre_bookmarks_get_all (VinagreBookmarks *book) +{ + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS (book), NULL); + + return book->priv->entries; +} + +void +vinagre_bookmarks_save_to_file (VinagreBookmarks *book) +{ + xmlTextWriter *writer; + xmlBuffer *buf; + int rc; + GError *error; + + writer = NULL; + buf = NULL; + error = NULL; + + buf = xmlBufferCreate (); + if (!buf) + { + g_warning (_("Error while saving bookmarks: Failed to create the XML structure")); + return; + } + + writer = xmlNewTextWriterMemory(buf, 0); + if (!writer) + { + g_warning (_("Error while saving bookmarks: Failed to create the XML structure")); + goto finalize; + } + + rc = xmlTextWriterStartDocument (writer, NULL, "utf-8", NULL); + if (rc < 0) + { + g_warning (_("Error while saving bookmarks: Failed to initialize the XML structure")); + goto finalize; + } + + rc = xmlTextWriterStartElement (writer, "vinagre-bookmarks"); + if (rc < 0) + { + g_warning (_("Error while saving bookmarks: Failed to initialize the XML structure")); + goto finalize; + } + + vinagre_bookmarks_save_fill_xml (book->priv->entries, writer); + + rc = xmlTextWriterEndDocument (writer); + if (rc < 0) + { + g_warning (_("Error while saving bookmarks: Failed to finalize the XML structure")); + goto finalize; + } + + if (!g_file_set_contents (book->priv->filename, + (const char *) buf->content, + -1, + &error)) + { + g_warning (_("Error while saving bookmarks: %s"), error?error->message:_("Unknown error")); + if (error) + g_error_free (error); + goto finalize; + } + +finalize: + if (writer) + xmlFreeTextWriter (writer); + if (buf) + xmlBufferFree (buf); +} + +void +vinagre_bookmarks_add_entry (VinagreBookmarks *book, + VinagreBookmarksEntry *entry, + VinagreBookmarksEntry *parent) +{ + /* I do not ref entry */ + if (parent) + vinagre_bookmarks_entry_add_child (parent, entry); + else + book->priv->entries = g_slist_insert_sorted (book->priv->entries, + entry, + (GCompareFunc)vinagre_bookmarks_entry_compare); + vinagre_bookmarks_save_to_file (book); +} + +gboolean +vinagre_bookmarks_remove_entry (VinagreBookmarks *book, + VinagreBookmarksEntry *entry) +{ + GSList *l; + + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS (book), FALSE); + + /* I do unref entry */ + if (g_slist_index (book->priv->entries, entry) > -1) + { + book->priv->entries = g_slist_remove (book->priv->entries, entry); + g_object_unref (entry); + vinagre_bookmarks_save_to_file (book); + return TRUE; + } + + for (l = book->priv->entries; l; l = l->next) + { + VinagreBookmarksEntry *e = (VinagreBookmarksEntry *) l->data; + + if (vinagre_bookmarks_entry_get_node (e) != VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) + continue; + + if (vinagre_bookmarks_entry_remove_child (e, entry)) + { + g_object_unref (entry); + vinagre_bookmarks_save_to_file (book); + return TRUE; + } + } + + return FALSE; +} + + +VinagreBookmarksEntry * +vinagre_bookmarks_name_exists (VinagreBookmarks *book, + VinagreBookmarksEntry *parent, + const gchar *name) +{ + GSList *entries, *l; + + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS (book), FALSE); + + if (parent) + entries = vinagre_bookmarks_entry_get_children (parent); + else + entries = book->priv->entries; + + for (l = entries; l; l = l->next) + { + VinagreBookmarksEntry *e = (VinagreBookmarksEntry *) l->data; + + if (vinagre_bookmarks_entry_get_node (e) == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) + { + if (g_strcmp0 (vinagre_bookmarks_entry_get_name (e), name) == 0) + return e; + } + else + { + VinagreConnection *conn = vinagre_bookmarks_entry_get_conn (e); + if (g_strcmp0 (vinagre_connection_get_name (conn), name) == 0) + return e; + } + } + + return NULL; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks-entry.c vinagre-2.29.1/vinagre/vinagre-bookmarks-entry.c --- vinagre-2.26.1/vinagre/vinagre-bookmarks-entry.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks-entry.c 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,288 @@ +/* + * vinagre-bookmarks-entry.c + * This file is part of vinagre + * + * Copyright (C) 2008 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "vinagre-bookmarks-entry.h" + +struct _VinagreBookmarksEntryPrivate +{ + VinagreBookmarksEntryNode node; + VinagreConnection *conn; + gchar *name; + GSList *children; // array of VinagreBookmarksEntry + VinagreBookmarksEntry *parent; +}; + +G_DEFINE_TYPE (VinagreBookmarksEntry, vinagre_bookmarks_entry, G_TYPE_OBJECT); + +static void +vinagre_bookmarks_entry_init (VinagreBookmarksEntry *entry) +{ + entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry, VINAGRE_TYPE_BOOKMARKS_ENTRY, VinagreBookmarksEntryPrivate); + + entry->priv->node = VINAGRE_BOOKMARKS_ENTRY_NODE_INVALID; + entry->priv->conn = NULL; + entry->priv->name = NULL; + entry->priv->children = NULL; + entry->priv->parent = NULL; +} + +static void +vinagre_bookmarks_entry_finalize (GObject *object) +{ + VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (object); + + if (entry->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) + g_free (entry->priv->name); + + G_OBJECT_CLASS (vinagre_bookmarks_entry_parent_class)->finalize (object); +} + +static void +vinagre_bookmarks_entry_dispose (GObject *object) +{ + VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (object); + + switch (entry->priv->node) + { + case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: + if (entry->priv->conn) + { + g_object_unref (entry->priv->conn); + entry->priv->conn = NULL; + } + break; + + case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: + if (entry->priv->children) + { + g_slist_foreach (entry->priv->children, (GFunc) g_object_unref, NULL); + g_slist_free (entry->priv->children); + entry->priv->children = NULL; + } + break; + + default: + g_assert_not_reached (); + } + + G_OBJECT_CLASS (vinagre_bookmarks_entry_parent_class)->dispose (object); +} + +static void +vinagre_bookmarks_entry_class_init (VinagreBookmarksEntryClass *klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (VinagreBookmarksEntryPrivate)); + + object_class->finalize = vinagre_bookmarks_entry_finalize; + object_class->dispose = vinagre_bookmarks_entry_dispose; +} + +VinagreBookmarksEntry * +vinagre_bookmarks_entry_new_folder (const gchar *name) +{ + VinagreBookmarksEntry *entry; + + g_return_val_if_fail (name != NULL, NULL); + + entry = VINAGRE_BOOKMARKS_ENTRY (g_object_new (VINAGRE_TYPE_BOOKMARKS_ENTRY, NULL)); + vinagre_bookmarks_entry_set_node (entry, VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER); + vinagre_bookmarks_entry_set_name (entry, name); + + return entry; +} + +VinagreBookmarksEntry * +vinagre_bookmarks_entry_new_conn (VinagreConnection *conn) +{ + VinagreBookmarksEntry *entry; + + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); + + entry = VINAGRE_BOOKMARKS_ENTRY (g_object_new (VINAGRE_TYPE_BOOKMARKS_ENTRY, NULL)); + vinagre_bookmarks_entry_set_node (entry, VINAGRE_BOOKMARKS_ENTRY_NODE_CONN); + vinagre_bookmarks_entry_set_conn (entry, conn); + + return entry; + +} + +void +vinagre_bookmarks_entry_set_node (VinagreBookmarksEntry *entry, VinagreBookmarksEntryNode node) +{ + g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); + + if (entry->priv->node == node) + return; + + entry->priv->node = node; + + switch (entry->priv->node) + { + case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: + g_free (entry->priv->name); + entry->priv->name = NULL; + g_slist_foreach (entry->priv->children, (GFunc) g_object_unref, NULL); + g_slist_free (entry->priv->children); + entry->priv->children = NULL; + break; + + case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: + if (entry->priv->conn) + { + g_object_unref (entry->priv->conn); + entry->priv->conn = NULL; + } + break; + + default: + g_assert_not_reached (); + } +} + +VinagreBookmarksEntryNode +vinagre_bookmarks_entry_get_node (VinagreBookmarksEntry *entry) +{ + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), VINAGRE_BOOKMARKS_ENTRY_NODE_INVALID); + + return entry->priv->node; +} + +void +vinagre_bookmarks_entry_set_conn (VinagreBookmarksEntry *entry, VinagreConnection *conn) +{ + g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + g_return_if_fail (entry->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_CONN); + + if (entry->priv->conn != NULL) + g_object_unref (entry->priv->conn); + + entry->priv->conn = g_object_ref (conn); +} + +VinagreConnection * +vinagre_bookmarks_entry_get_conn (VinagreBookmarksEntry *entry) +{ + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), NULL); + + return entry->priv->conn; +} + +void +vinagre_bookmarks_entry_set_name (VinagreBookmarksEntry *entry, const gchar *name) +{ + g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); + g_return_if_fail (entry->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER); + g_return_if_fail (name != NULL); + + g_free (entry->priv->name); + entry->priv->name = g_strdup (name); +} + +const gchar * +vinagre_bookmarks_entry_get_name (VinagreBookmarksEntry *entry) +{ + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), NULL); + + return entry->priv->name; +} + +void +vinagre_bookmarks_entry_add_child (VinagreBookmarksEntry *entry, VinagreBookmarksEntry *child) +{ + g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); + g_return_if_fail (entry->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER); + g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (child)); + + entry->priv->children = g_slist_insert_sorted (entry->priv->children, + child, + (GCompareFunc)vinagre_bookmarks_entry_compare); + child->priv->parent = entry; +} + +gboolean +vinagre_bookmarks_entry_remove_child (VinagreBookmarksEntry *entry, + VinagreBookmarksEntry *child) +{ + GSList *l; + + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), FALSE); + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (child), FALSE); + + if (g_slist_index (entry->priv->children, child) > -1) + { + entry->priv->children = g_slist_remove (entry->priv->children, child); + return TRUE; + } + + for (l = entry->priv->children; l; l = l->next) + { + VinagreBookmarksEntry *e = (VinagreBookmarksEntry *) l->data; + + if (vinagre_bookmarks_entry_get_node (e) != VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) + continue; + + if (vinagre_bookmarks_entry_remove_child (e, child)) + return TRUE; + } + + return FALSE; +} + +GSList * +vinagre_bookmarks_entry_get_children (VinagreBookmarksEntry *entry) +{ + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), NULL); + + return entry->priv->children; +} + +VinagreBookmarksEntry * +vinagre_bookmarks_entry_get_parent (VinagreBookmarksEntry *entry) +{ + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), NULL); + + return entry->priv->parent; +} + +gint +vinagre_bookmarks_entry_compare (VinagreBookmarksEntry *a, VinagreBookmarksEntry *b) +{ + gchar *name_a, *name_b; + gint result; + + if (a->priv->node != b->priv->node) + return a->priv->node - b->priv->node; + + if (a->priv->node == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) + return g_ascii_strcasecmp (a->priv->name, b->priv->name); + + name_a = vinagre_connection_get_best_name (a->priv->conn); + name_b = vinagre_connection_get_best_name (b->priv->conn); + result = g_ascii_strcasecmp (name_a, name_b); + g_free (name_a); + g_free (name_b); + + return result; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks-entry.h vinagre-2.29.1/vinagre/vinagre-bookmarks-entry.h --- vinagre-2.26.1/vinagre/vinagre-bookmarks-entry.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks-entry.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,86 @@ +/* + * vinagre-bookmarks-entry.h + * This file is part of vinagre + * + * Copyright (C) 2008 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_BOOKMARKS_ENTRY_H__ +#define __VINAGRE_BOOKMARKS_ENTRY_H__ + +#include +#include "vinagre-connection.h" + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_BOOKMARKS_ENTRY (vinagre_bookmarks_entry_get_type ()) +#define VINAGRE_BOOKMARKS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_BOOKMARKS_ENTRY, VinagreBookmarksEntry)) +#define VINAGRE_BOOKMARKS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_BOOKMARKS_ENTRY, VinagreBookmarksEntryClass)) +#define VINAGRE_IS_BOOKMARKS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_BOOKMARKS_ENTRY)) +#define VINAGRE_IS_BOOKMARKS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_BOOKMARKS_ENTRY)) +#define VINAGRE_BOOKMARKS_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_BOOKMARKS_ENTRY, VinagreBookmarksEntryClass)) + +typedef struct _VinagreBookmarksEntryClass VinagreBookmarksEntryClass; +typedef struct _VinagreBookmarksEntry VinagreBookmarksEntry; +typedef struct _VinagreBookmarksEntryPrivate VinagreBookmarksEntryPrivate; + +typedef enum { + VINAGRE_BOOKMARKS_ENTRY_NODE_INVALID = 0, + VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER, + VINAGRE_BOOKMARKS_ENTRY_NODE_CONN +} VinagreBookmarksEntryNode; + +struct _VinagreBookmarksEntryClass +{ + GObjectClass parent_class; +}; + +struct _VinagreBookmarksEntry +{ + GObject parent_instance; + VinagreBookmarksEntryPrivate *priv; +}; + + +GType vinagre_bookmarks_entry_get_type (void) G_GNUC_CONST; + +VinagreBookmarksEntry * vinagre_bookmarks_entry_new_folder (const gchar *name); +VinagreBookmarksEntry * vinagre_bookmarks_entry_new_conn (VinagreConnection *conn); + +void vinagre_bookmarks_entry_add_child (VinagreBookmarksEntry *entry, VinagreBookmarksEntry *child); +gboolean vinagre_bookmarks_entry_remove_child(VinagreBookmarksEntry *entry, + VinagreBookmarksEntry *child); + +GSList * vinagre_bookmarks_entry_get_children(VinagreBookmarksEntry *entry); + +void vinagre_bookmarks_entry_set_node (VinagreBookmarksEntry *entry, VinagreBookmarksEntryNode node); +VinagreBookmarksEntryNode vinagre_bookmarks_entry_get_node (VinagreBookmarksEntry *entry); + +void vinagre_bookmarks_entry_set_conn (VinagreBookmarksEntry *entry, VinagreConnection *conn); +VinagreConnection * vinagre_bookmarks_entry_get_conn (VinagreBookmarksEntry *entry); + +void vinagre_bookmarks_entry_set_name (VinagreBookmarksEntry *entry, const gchar *name); +const gchar * vinagre_bookmarks_entry_get_name (VinagreBookmarksEntry *entry); + +//void vinagre_bookmarks_entry_set_parent (VinagreBookmarksEntry *entry, VinagreBookmarksEntry *parent); +VinagreBookmarksEntry * vinagre_bookmarks_entry_get_parent (VinagreBookmarksEntry *entry); + +gint vinagre_bookmarks_entry_compare (VinagreBookmarksEntry *a, VinagreBookmarksEntry *b); +G_END_DECLS + +#endif /* __VINAGRE_BOOKMARKS_ENTRY_H__ */ + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks.h vinagre-2.29.1/vinagre/vinagre-bookmarks.h --- vinagre-2.26.1/vinagre/vinagre-bookmarks.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks.h 2009-07-28 15:45:14.000000000 +0100 @@ -0,0 +1,82 @@ +/* + * vinagre-bookmarks.h + * This file is part of vinagre + * + * Copyright (C) 2007,2008 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_BOOKMARKS_H__ +#define __VINAGRE_BOOKMARKS_H__ + +#include +#include + +#include "vinagre-connection.h" +#include "vinagre-bookmarks-entry.h" + +G_BEGIN_DECLS + +#define VINAGRE_BOOKMARKS_FILE "vinagre-bookmarks.xml" +#define VINAGRE_BOOKMARKS_FILE_OLD "vinagre.bookmarks" + +#define VINAGRE_TYPE_BOOKMARKS (vinagre_bookmarks_get_type ()) +#define VINAGRE_BOOKMARKS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_BOOKMARKS, VinagreBookmarks)) +#define VINAGRE_BOOKMARKS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_BOOKMARKS, VinagreBookmarksClass)) +#define VINAGRE_IS_BOOKMARKS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_BOOKMARKS)) +#define VINAGRE_IS_BOOKMARKS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_BOOKMARKS)) +#define VINAGRE_BOOKMARKS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_BOOKMARKS, VinagreBookmarksClass)) + +typedef struct _VinagreBookmarksClass VinagreBookmarksClass; +typedef struct _VinagreBookmarks VinagreBookmarks; +typedef struct _VinagreBookmarksPrivate VinagreBookmarksPrivate; + +struct _VinagreBookmarksClass +{ + GObjectClass parent_class; + + /* Signals */ + void (* changed) (VinagreBookmarks *book); +}; + +struct _VinagreBookmarks +{ + GObject parent_instance; + VinagreBookmarksPrivate *priv; +}; + +GType vinagre_bookmarks_get_type (void) G_GNUC_CONST; + +VinagreBookmarks *vinagre_bookmarks_get_default (void); +GSList *vinagre_bookmarks_get_all (VinagreBookmarks *book); +void vinagre_bookmarks_save_to_file (VinagreBookmarks *book); +void vinagre_bookmarks_add_entry (VinagreBookmarks *book, + VinagreBookmarksEntry *entry, + VinagreBookmarksEntry *parent); +gboolean vinagre_bookmarks_remove_entry (VinagreBookmarks *book, + VinagreBookmarksEntry *entry); + +VinagreConnection *vinagre_bookmarks_exists (VinagreBookmarks *book, + const gchar *protocol, + const gchar *host, + gint port); + +VinagreBookmarksEntry *vinagre_bookmarks_name_exists (VinagreBookmarks *book, + VinagreBookmarksEntry *parent, + const gchar *name); + +G_END_DECLS +#endif /* __VINAGRE_BOOKMARKS_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks-migration.c vinagre-2.29.1/vinagre/vinagre-bookmarks-migration.c --- vinagre-2.26.1/vinagre/vinagre-bookmarks-migration.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks-migration.c 2009-07-27 12:59:30.000000000 +0100 @@ -0,0 +1,291 @@ +/* + * vinagre-bookmarks-migration.c + * This file is part of vinagre + * + * Copyright (C) 2008 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * This is a temporary hack to migrate the bookmarks from an .ini format to + * a XML one. The new format is used in Vinagre 2.25. + */ + +#include +#include +#include +#include +#include + +#include "vinagre-bookmarks-entry.h" +#include "vinagre-connection.h" +#include "vinagre-bookmarks-migration.h" +#include "vinagre-bookmarks.h" +#include "vinagre-plugin.h" +#include "vinagre-plugins-engine.h" + +static void +fill_xml (GSList *list, xmlTextWriter *writer) +{ + GSList *l; + VinagreBookmarksEntry *entry; + VinagreConnection *conn; + + for (l = list; l; l = l->next) + { + entry = (VinagreBookmarksEntry *) l->data; + switch (vinagre_bookmarks_entry_get_node (entry)) + { + case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: + xmlTextWriterStartElement (writer, "folder"); + xmlTextWriterWriteAttribute (writer, "name", vinagre_bookmarks_entry_get_name (entry)); + + fill_xml (vinagre_bookmarks_entry_get_children (entry), writer); + xmlTextWriterEndElement (writer); + break; + + case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: + conn = vinagre_bookmarks_entry_get_conn (entry); + + xmlTextWriterStartElement (writer, "item"); + xmlTextWriterWriteElement (writer, "name", vinagre_connection_get_name (conn)); + xmlTextWriterWriteElement (writer, "host", vinagre_connection_get_host (conn)); + xmlTextWriterWriteFormatElement (writer, "port", "%d", vinagre_connection_get_port (conn)); + //xmlTextWriterWriteFormatElement (writer, "view_only", "%d", vinagre_connection_get_view_only (conn)); + //xmlTextWriterWriteFormatElement (writer, "scaling", "%d", vinagre_connection_get_scaling (conn)); + xmlTextWriterWriteFormatElement (writer, "fullscreen", "%d", vinagre_connection_get_fullscreen (conn)); + + xmlTextWriterEndElement (writer); + break; + + default: + g_assert_not_reached (); + } + } +} + +static gboolean +save_to_file (GSList *entries, const gchar *filename) +{ + xmlTextWriter *writer; + xmlBuffer *buf; + int rc; + GError *error; + gboolean result; + + writer = NULL; + buf = NULL; + result = FALSE; + + buf = xmlBufferCreate (); + if (!buf) + { + g_warning (_("Error while migrating bookmarks: Failed to create the XML structure")); + return FALSE; + } + + writer = xmlNewTextWriterMemory(buf, 0); + if (!writer) + { + g_warning (_("Error while migrating bookmarks: Failed to create the XML structure")); + goto finalize; + } + + rc = xmlTextWriterStartDocument (writer, NULL, "utf-8", NULL); + if (rc < 0) + { + g_warning (_("Error while migrating bookmarks: Failed to initialize the XML structure")); + goto finalize; + } + + rc = xmlTextWriterStartElement (writer, "vinagre-bookmarks"); + if (rc < 0) + { + g_warning (_("Error while migrating bookmarks: Failed to initialize the XML structure")); + goto finalize; + } + + fill_xml (entries, writer); + + rc = xmlTextWriterEndDocument (writer); + if (rc < 0) + { + g_warning (_("Error while migrating bookmarks: Failed to finalize the XML structure")); + goto finalize; + } + + error = NULL; + if (!g_file_set_contents (filename, + (const char *) buf->content, + -1, + &error)) + { + g_warning (_("Error while migrating bookmarks: %s"), error?error->message:_("Unknown error")); + if (error) + g_error_free (error); + goto finalize; + } + + result = TRUE; + +finalize: + if (writer) + xmlFreeTextWriter (writer); + if (buf) + xmlBufferFree (buf); + + return result; +} + +static GSList * +create_list (GKeyFile *kf) +{ + GSList *entries; + gchar **conns; + gsize length, i; + VinagrePlugin *plugin; + + plugin = g_hash_table_lookup (vinagre_plugin_engine_get_plugins_by_protocol (vinagre_plugins_engine_get_default ()), + "vnc"); + if (!plugin) + { + g_warning (_("Error while migrating bookmarks: VNC plugin is not activated")); + return NULL; + } + + entries = NULL; + conns = g_key_file_get_groups (kf, &length); + for (i=0; imessage:_("Failed to create the directory")); + if (error) + g_error_free (error); + return; + } + + old = g_build_filename (g_get_user_data_dir (), + "vinagre", + VINAGRE_BOOKMARKS_FILE_OLD, + NULL); + if (!g_file_test (old, G_FILE_TEST_EXISTS)) + { + g_free (old); + old = g_build_filename (g_get_home_dir (), + ".gnome2", + VINAGRE_BOOKMARKS_FILE_OLD, + NULL); + if (!g_file_test (old, G_FILE_TEST_EXISTS)) + { + g_free (old); + return; + } + } + + g_message (_("Migrating the bookmarks file to the new format. This operation is only supposed to run once.")); + + kf = g_key_file_new (); + if (!g_key_file_load_from_file (kf, + old, + G_KEY_FILE_NONE, + &error)) + { + g_warning (_("Error opening old bookmarks file: %s"), error->message); + g_warning (_("Migration cancelled")); + g_error_free (error); + return; + } + + entries = create_list (kf); + if (save_to_file (entries, filename)) + { + if (g_unlink (old) != 0) + g_warning (_("Could not remove the old bookmarks file")); + } + else + g_warning (_("Migration cancelled")); + + g_slist_foreach (entries, (GFunc) g_object_unref, NULL); + g_slist_free (entries); + g_key_file_free (kf); + g_free (old); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks-migration.h vinagre-2.29.1/vinagre/vinagre-bookmarks-migration.h --- vinagre-2.26.1/vinagre/vinagre-bookmarks-migration.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks-migration.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,37 @@ +/* + * vinagre-bookmarks-migration.h + * This file is part of vinagre + * + * Copyright (C) 2008 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * This is a temporary hack to migrate the bookmarks from an .ini format to + * a XML one. The new format is used in Vinagre 2.25. + */ + +#ifndef __VINAGRE_BOOKMARKS_MIGRATION_H__ +#define __VINAGRE_BOOKMARKS_MIGRATION_H__ + +G_BEGIN_DECLS + +void vinagre_bookmarks_migration_migrate (const gchar *filename); + +G_END_DECLS + +#endif /* __VINAGRE_BOOKMARKS_MIGRATION_H__ */ + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks-tree.c vinagre-2.29.1/vinagre/vinagre-bookmarks-tree.c --- vinagre-2.26.1/vinagre/vinagre-bookmarks-tree.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks-tree.c 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,292 @@ +/* + * vinagre-bookmarks-tree.c + * This file is part of vinagre + * + * Copyright (C) Jonh Wendell 2008 + * + * vinagre 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 3 of the License, or + * (at your option) any later version. + * + * vinagre 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include "vinagre-bookmarks-tree.h" +#include "vinagre-bookmarks-entry.h" +#include "vinagre-bookmarks.h" + +#include +#include + +struct _VinagreBookmarksTreePrivate +{ + GtkWidget *tree; +}; + +/* TreeModel */ +enum { + IMAGE_COL = 0, + NAME_COL, + ENTRY_COL, + NUM_COLS +}; + +G_DEFINE_TYPE (VinagreBookmarksTree, vinagre_bookmarks_tree, GTK_TYPE_VBOX); + +static void +vinagre_bookmarks_tree_row_activated_cb (GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *column, + VinagreBookmarksTree *tree) +{ + GtkTreeIter iter; + GtkTreeModel *model; + GtkWidget *toplevel; + + model = gtk_tree_view_get_model (treeview); + + gtk_tree_model_get_iter (model, &iter, path); + if (gtk_tree_model_iter_has_child (model, &iter)) + { + if (gtk_tree_view_row_expanded (treeview, path)) + gtk_tree_view_collapse_row (treeview, path); + else + gtk_tree_view_expand_row (treeview, path, FALSE); + return; + } + else + { + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (tree)); + if (GTK_IS_WINDOW (toplevel)) + gtk_window_activate_default (GTK_WINDOW (toplevel)); + } +} + +static void +vinagre_bookmarks_fill_tree (GSList *entries, GtkTreeStore *store, GtkTreeIter *parent, GdkPixbuf *pixbuf) +{ + GSList *l; + GtkTreeIter iter; + VinagreBookmarksEntry *entry; + + for (l = entries; l; l = l->next) + { + entry = VINAGRE_BOOKMARKS_ENTRY (l->data); + if (vinagre_bookmarks_entry_get_node (entry) != VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) + continue; + + gtk_tree_store_append (store, &iter, parent); + gtk_tree_store_set (store, &iter, + IMAGE_COL, pixbuf, + NAME_COL, vinagre_bookmarks_entry_get_name (entry), + ENTRY_COL, entry, + -1); + vinagre_bookmarks_fill_tree (vinagre_bookmarks_entry_get_children (entry), + store, + &iter, + pixbuf); + } +} + +static gboolean +vinagre_bookmarks_tree_update_list (VinagreBookmarksTree *tree) +{ + GtkTreeStore *model; + GtkTreeIter iter; + GdkPixbuf *pixbuf; + GtkIconTheme *icon_theme; + GtkTreeSelection *selection; + GtkTreePath *path; + + icon_theme = gtk_icon_theme_get_default (); + pixbuf = gtk_icon_theme_load_icon (icon_theme, + "folder", + 16, + 0, + NULL); + + model = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (tree->priv->tree))); + + gtk_tree_store_append (model, &iter, NULL); + gtk_tree_store_set (model, &iter, + IMAGE_COL, pixbuf, + NAME_COL, _("Root Folder"), + -1); + + vinagre_bookmarks_fill_tree (vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()), + model, + NULL, + pixbuf); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree->priv->tree)); + gtk_tree_selection_select_iter (selection, &iter); + + g_object_unref (pixbuf); + return FALSE; +} + +static void +vinagre_bookmarks_tree_init (VinagreBookmarksTree *tree) +{ + GtkCellRenderer *cell; + GtkWidget *scroll; + GtkTreeSelection *selection; + GtkTreeStore *model; + GtkTreeViewColumn *main_column; + + tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree, VINAGRE_TYPE_BOOKMARKS_TREE, VinagreBookmarksTreePrivate); + + /* Create the scrolled window */ + scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), + GTK_SHADOW_ETCHED_OUT); + gtk_widget_set_size_request (scroll, 200, 180); + gtk_box_pack_start (GTK_BOX (tree), scroll, TRUE, TRUE, 0); + + /* Create the model */ + model = gtk_tree_store_new (NUM_COLS, + GDK_TYPE_PIXBUF, + G_TYPE_STRING, + VINAGRE_TYPE_BOOKMARKS_ENTRY); + + tree->priv->tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree->priv->tree), FALSE); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree->priv->tree)); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); + g_object_unref (model); + + main_column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_clickable (main_column, FALSE); + gtk_tree_view_append_column (GTK_TREE_VIEW (tree->priv->tree), main_column); + + /* Set up the pixbuf column */ + cell = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (main_column, cell, FALSE); + gtk_tree_view_column_add_attribute (main_column, cell, "pixbuf", IMAGE_COL); + + /* Set up the name column */ + cell = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (main_column, cell, TRUE); + gtk_tree_view_column_add_attribute (main_column, cell, "text", NAME_COL); + + g_signal_connect (tree->priv->tree, + "row-activated", + G_CALLBACK (vinagre_bookmarks_tree_row_activated_cb), + tree); + + vinagre_bookmarks_tree_update_list (tree); + + gtk_container_add (GTK_CONTAINER(scroll), tree->priv->tree); + gtk_widget_show (tree->priv->tree); +} + +static void +vinagre_bookmarks_tree_class_init (VinagreBookmarksTreeClass *klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (VinagreBookmarksTreePrivate)); +} + +GtkWidget * +vinagre_bookmarks_tree_new (void) +{ + return GTK_WIDGET (g_object_new (VINAGRE_TYPE_BOOKMARKS_TREE, NULL)); +} + +VinagreBookmarksEntry * +vinagre_bookmarks_tree_get_selected_entry (VinagreBookmarksTree *tree) +{ + GtkTreeSelection *selection; + GtkTreeIter iter; + GtkTreeModel *model; + VinagreBookmarksEntry *entry; + + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_TREE (tree), NULL); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree->priv->tree)); + if (gtk_tree_selection_get_selected (selection, NULL, &iter)) + { + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree->priv->tree)); + gtk_tree_model_get (model, + &iter, + ENTRY_COL, &entry, + -1); + return entry; + } + else + return NULL; +} + +struct _find_entry +{ + VinagreBookmarksEntry *entry; + gboolean found; + GtkTreePath *path; +}; + +static gboolean +find_entry (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + VinagreBookmarksEntry *entry; + struct _find_entry *f = data; + + gtk_tree_model_get (model, + iter, + ENTRY_COL, &entry, + -1); + if (entry == f->entry) + { + f->found = TRUE; + f->path = gtk_tree_path_copy (path); + return TRUE; + } + + return FALSE; +} + +gboolean +vinagre_bookmarks_tree_select_entry (VinagreBookmarksTree *tree, + VinagreBookmarksEntry *entry) +{ + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreePath *path; + gboolean valid; + struct _find_entry f; + + if (!entry) + return FALSE; + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_TREE (tree), FALSE); + g_return_val_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry), FALSE); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree->priv->tree)); + f.entry = entry; + f.found = FALSE; + + gtk_tree_model_foreach (model, find_entry, &f); + if (f.found) + { + gtk_tree_view_expand_to_path (GTK_TREE_VIEW (tree->priv->tree), f.path); + gtk_tree_view_set_cursor (GTK_TREE_VIEW (tree->priv->tree), f.path, NULL, FALSE); + gtk_tree_path_free (f.path); + return TRUE; + } + else + return FALSE; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks-tree.h vinagre-2.29.1/vinagre/vinagre-bookmarks-tree.h --- vinagre-2.26.1/vinagre/vinagre-bookmarks-tree.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks-tree.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,63 @@ +/* + * vinagre-bookmarks-tree.h + * This file is part of vinagre + * + * Copyright (C) Jonh Wendell 2008 + * + * vinagre 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 3 of the License, or + * (at your option) any later version. + * + * vinagre 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef _VINAGRE_BOOKMARKS_TREE_H_ +#define _VINAGRE_BOOKMARKS_TREE_H_ + +#include +#include +#include "vinagre-bookmarks-entry.h" + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_BOOKMARKS_TREE (vinagre_bookmarks_tree_get_type ()) +#define VINAGRE_BOOKMARKS_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_BOOKMARKS_TREE, VinagreBookmarksTree)) +#define VINAGRE_BOOKMARKS_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_BOOKMARKS_TREE, VinagreBookmarksTreeClass)) +#define VINAGRE_IS_BOOKMARKS_TREE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_BOOKMARKS_TREE)) +#define VINAGRE_IS_BOOKMARKS_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_BOOKMARKS_TREE)) +#define VINAGRE_BOOKMARKS_TREE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_BOOKMARKS_TREE, VinagreBookmarksTreeClass)) + +typedef struct _VinagreBookmarksTreeClass VinagreBookmarksTreeClass; +typedef struct _VinagreBookmarksTree VinagreBookmarksTree; +typedef struct _VinagreBookmarksTreePrivate VinagreBookmarksTreePrivate; + +struct _VinagreBookmarksTreeClass +{ + GtkVBoxClass parent_class; +}; + +struct _VinagreBookmarksTree +{ + GtkVBox parent_instance; + VinagreBookmarksTreePrivate *priv; +}; + +GType vinagre_bookmarks_tree_get_type (void) G_GNUC_CONST; + +GtkWidget* vinagre_bookmarks_tree_new (void); +gboolean vinagre_bookmarks_tree_select_entry (VinagreBookmarksTree *tree, + VinagreBookmarksEntry *entry); +VinagreBookmarksEntry* vinagre_bookmarks_tree_get_selected_entry (VinagreBookmarksTree *tree); + +G_END_DECLS + +#endif /* _VINAGRE_BOOKMARKS_TREE_H_ */ + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks-ui.c vinagre-2.29.1/vinagre/vinagre-bookmarks-ui.c --- vinagre-2.26.1/vinagre/vinagre-bookmarks-ui.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks-ui.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,358 @@ +/* + * vinagre-bookmarks-ui.c + * This file is part of vinagre + * + * Copyright (C) 2008 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include + +#include "vinagre-bookmarks-ui.h" +#include "vinagre-utils.h" +#include "vinagre-bookmarks-tree.h" +#include "vinagre-plugin.h" +#include "vinagre-plugins-engine.h" + +static void +control_save_button_visibility (GtkEntry *ed, GtkWidget *bt) +{ + gtk_widget_set_sensitive (bt, + gtk_entry_get_text_length (ed) > 0); +} + +static void +show_dialog_folder (VinagreBookmarks *book, + GtkWindow *window, + VinagreBookmarksEntry *entry, + gboolean is_add) +{ + GtkBuilder *xml; + GtkWidget *dialog, *box, *tree, *name_entry, *save_button; + const gchar *name; + + xml = vinagre_utils_get_builder (NULL, NULL); + dialog = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_folder_dialog")); + name_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_folder_name_entry")); + box = GTK_WIDGET (gtk_builder_get_object (xml, "folder_box1")); + save_button= GTK_WIDGET (gtk_builder_get_object (xml, "save_button")); + + gtk_window_set_transient_for (GTK_WINDOW (dialog), window); + gtk_entry_set_text (GTK_ENTRY (name_entry), vinagre_bookmarks_entry_get_name (entry)); + gtk_editable_set_position (GTK_EDITABLE (name_entry), -1); + g_signal_connect (name_entry, "changed", G_CALLBACK (control_save_button_visibility), save_button); + + tree = vinagre_bookmarks_tree_new (); + vinagre_bookmarks_tree_select_entry (VINAGRE_BOOKMARKS_TREE (tree), + vinagre_bookmarks_entry_get_parent (entry)); + gtk_box_pack_end (GTK_BOX (box), tree, TRUE, TRUE, 0); + + gtk_widget_show_all (dialog); + while (TRUE) + { + VinagreBookmarksEntry *existing_entry; + + if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) + { + if (is_add) + g_object_unref (entry); + goto finalize; + } + + name = gtk_entry_get_text (GTK_ENTRY (name_entry)); + if (strlen (name) < 1) + { + vinagre_utils_show_error (NULL, _("Invalid name for this folder"), GTK_WINDOW (dialog)); + gtk_widget_grab_focus (name_entry); + continue; + } + + existing_entry = vinagre_bookmarks_name_exists (book, + vinagre_bookmarks_tree_get_selected_entry (VINAGRE_BOOKMARKS_TREE (tree)), + name); + if (existing_entry && existing_entry != entry) + { + gchar *str = g_strdup_printf (_("The name \"%s\" is already used in this folder. Please use a different name."), name); + vinagre_utils_show_error (_("Invalid name for this item"), + str, + GTK_WINDOW (dialog)); + g_free (str); + gtk_widget_grab_focus (name_entry); + continue; + } + + break; + } + + vinagre_bookmarks_entry_set_name (entry, name); + if (!is_add) + { + g_object_ref (entry); + vinagre_bookmarks_remove_entry (book, entry); + } + vinagre_bookmarks_add_entry ( book, + entry, + vinagre_bookmarks_tree_get_selected_entry (VINAGRE_BOOKMARKS_TREE (tree))); + +finalize: + gtk_widget_destroy (GTK_WIDGET (dialog)); + g_object_unref (G_OBJECT (xml)); +} + +static void +show_dialog_conn (VinagreBookmarks *book, + GtkWindow *window, + VinagreBookmarksEntry *entry, + gboolean is_add) +{ + gchar *str, *host, *error_str, *protocol; + gint port; + GtkBuilder *xml; + GtkWidget *dialog, *host_entry, *name_entry, *fs_check; + GtkWidget *folder_box, *tree, *save_button, *plugin_box; + GtkWidget *plugin_options, *protocol_label; + VinagreConnection *conn; + const gchar *name; + VinagrePlugin *plugin; + gchar **props; + + xml = vinagre_utils_get_builder (NULL, NULL); + dialog = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_conn_dialog")); + name_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_name_entry")); + host_entry = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_host_entry")); + fs_check = GTK_WIDGET (gtk_builder_get_object (xml, "bookmark_fullscreen_check")); + folder_box = GTK_WIDGET (gtk_builder_get_object (xml, "folder_box")); + plugin_box = GTK_WIDGET (gtk_builder_get_object (xml, "plugin_options_vbox")); + save_button = GTK_WIDGET (gtk_builder_get_object (xml, "save_button")); + protocol_label = GTK_WIDGET (gtk_builder_get_object (xml, "protocol_label")); + + gtk_window_set_transient_for (GTK_WINDOW (dialog), window); + conn = vinagre_bookmarks_entry_get_conn (entry); + + str = vinagre_connection_get_best_name (conn); + gtk_entry_set_text (GTK_ENTRY (name_entry), str); + gtk_editable_set_position (GTK_EDITABLE (name_entry), -1); + g_signal_connect (name_entry, "changed", G_CALLBACK (control_save_button_visibility), save_button); + g_free (str); + + str = vinagre_connection_get_string_rep (conn, FALSE); + gtk_entry_set_text (GTK_ENTRY (host_entry), str); + g_free (str); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fs_check), + vinagre_connection_get_fullscreen (conn)); + + plugin = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), + vinagre_connection_get_protocol (conn)); + plugin_options = vinagre_plugin_get_connect_widget (plugin, conn); + if (plugin_options) + gtk_box_pack_start (GTK_BOX (plugin_box), plugin_options, TRUE, TRUE, 0); + else + gtk_widget_hide (plugin_box); + + props = vinagre_plugin_get_public_description (plugin); + /* Translators: %s is a protocol name, like VNC or SSH */ + str = g_strdup_printf (_("(Protocol: %s)"), props[0]); + gtk_label_set_label (GTK_LABEL (protocol_label), str); + g_free (str); + g_strfreev (props); + + tree = vinagre_bookmarks_tree_new (); + vinagre_bookmarks_tree_select_entry (VINAGRE_BOOKMARKS_TREE (tree), + vinagre_bookmarks_entry_get_parent (entry)); + gtk_box_pack_end (GTK_BOX (folder_box), tree, TRUE, TRUE, 0); + + gtk_widget_show_all (dialog); + + while (TRUE) + { + VinagreBookmarksEntry *existing_entry; + + if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) + goto finalize; + + name = gtk_entry_get_text (GTK_ENTRY (name_entry)); + if (strlen (name) < 1) + { + vinagre_utils_show_error (NULL, _("Invalid name for this item"), GTK_WINDOW (dialog)); + gtk_widget_grab_focus (name_entry); + continue; + } + + existing_entry = vinagre_bookmarks_name_exists (book, + vinagre_bookmarks_tree_get_selected_entry (VINAGRE_BOOKMARKS_TREE (tree)), + name); + if (existing_entry && existing_entry != entry) + { + str = g_strdup_printf (_("The name \"%s\" is already used in this folder. Please use a different name."), name); + vinagre_utils_show_error (_("Invalid name for this item"), + str, + GTK_WINDOW (dialog)); + g_free (str); + gtk_widget_grab_focus (name_entry); + continue; + } + + if (!vinagre_connection_split_string (gtk_entry_get_text (GTK_ENTRY (host_entry)), + vinagre_connection_get_protocol (conn), + &protocol, + &host, + &port, + &error_str)) + { + vinagre_utils_show_error (NULL, error_str, GTK_WINDOW (dialog)); + g_free (error_str); + gtk_widget_grab_focus (host_entry); + continue; + } + + break; + } + + g_object_set (conn, + "name", name, + "host", host, + "port", port, + "fullscreen", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fs_check)), + NULL); + + if (plugin_options) + vinagre_connection_parse_options_widget (conn, plugin_options); + + g_free (protocol); + g_free (host); + + if (!is_add) + { + g_object_ref (entry); + vinagre_bookmarks_remove_entry (book, entry); + } + vinagre_bookmarks_add_entry ( book, + entry, + vinagre_bookmarks_tree_get_selected_entry (VINAGRE_BOOKMARKS_TREE (tree))); + +finalize: + gtk_widget_destroy (GTK_WIDGET (dialog)); + g_object_unref (G_OBJECT (xml)); +} + +void +vinagre_bookmarks_add (VinagreBookmarks *book, + VinagreConnection *conn, + GtkWindow *window) +{ + VinagreBookmarksEntry *entry; + + g_return_if_fail (VINAGRE_IS_BOOKMARKS (book)); + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + entry = vinagre_bookmarks_entry_new_conn (conn); + show_dialog_conn (book, window, entry, TRUE); +} + +void +vinagre_bookmarks_edit (VinagreBookmarks *book, + VinagreBookmarksEntry *entry, + GtkWindow *window) +{ + g_return_if_fail (VINAGRE_IS_BOOKMARKS (book)); + g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); + + g_object_ref (entry); + + switch (vinagre_bookmarks_entry_get_node (entry)) + { + case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: + show_dialog_folder (book, window, entry, FALSE); + break; + + case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: + show_dialog_conn (book, window, entry, FALSE); + break; + + default: + g_assert_not_reached (); + } + + g_object_unref (entry); +} + +void +vinagre_bookmarks_del (VinagreBookmarks *book, + VinagreBookmarksEntry *entry, + GtkWindow *window) +{ + GtkWidget *dialog; + gchar *name, *title, *msg1, *msg2; + GError *error = NULL; + GSList *parent; + + g_return_if_fail (VINAGRE_IS_BOOKMARKS (book)); + g_return_if_fail (VINAGRE_IS_BOOKMARKS_ENTRY (entry)); + + name = g_strdup ("%s"); + /* Translators: %s is a bookmark entry name*/ + msg1 = g_strdup_printf (_("Are you sure you want to remove %s from bookmarks?"), name); + g_free (name); + + if (vinagre_bookmarks_entry_get_node (entry) == VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER) + { + name = g_strdup (vinagre_bookmarks_entry_get_name (entry)); + title = g_strdup (_("Remove Folder?")); + msg2 = g_strdup_printf ("%s\n\n%s", msg1, _("Notice that all its subfolders and items will be removed as well.")); + } + else + { + name = vinagre_connection_get_best_name (vinagre_bookmarks_entry_get_conn (entry)); + title = g_strdup (_("Remove Item?")); + msg2 = g_strdup (msg1); + } + + dialog = gtk_message_dialog_new (window, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_OK_CANCEL, + "%s", + title); + + gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), + msg2, + name); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) + if (!vinagre_bookmarks_remove_entry (book, entry)) + g_warning (_("Error removing bookmark: Entry not found")); + + gtk_widget_destroy (dialog); + g_free (name); + g_free (title); + g_free (msg1); + g_free (msg2); +} + +void +vinagre_bookmarks_new_folder (VinagreBookmarks *book, + GtkWindow *window) +{ + VinagreBookmarksEntry *entry; + + g_return_if_fail (VINAGRE_IS_BOOKMARKS (book)); + + entry = vinagre_bookmarks_entry_new_folder (_("New Folder")); + show_dialog_folder (book, window, entry, TRUE); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-bookmarks-ui.h vinagre-2.29.1/vinagre/vinagre-bookmarks-ui.h --- vinagre-2.26.1/vinagre/vinagre-bookmarks-ui.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-bookmarks-ui.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,50 @@ +/* + * vinagre-bookmarks-ui.h + * This file is part of vinagre + * + * Copyright (C) 2008 Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_BOOKMARKS_UI_H__ +#define __VINAGRE_BOOKMARKS_UI_H__ + +#include +#include + +#include "vinagre-connection.h" +#include "vinagre-bookmarks.h" +#include "vinagre-bookmarks-entry.h" +#include "vinagre-window.h" + +G_BEGIN_DECLS + +void vinagre_bookmarks_add (VinagreBookmarks *book, + VinagreConnection *conn, + GtkWindow *window); +void vinagre_bookmarks_del (VinagreBookmarks *book, + VinagreBookmarksEntry *entry, + GtkWindow *window); +void vinagre_bookmarks_edit (VinagreBookmarks *book, + VinagreBookmarksEntry *entry, + GtkWindow *window); +void vinagre_bookmarks_new_folder (VinagreBookmarks *book, + GtkWindow *window); + +G_END_DECLS + +#endif /* __VINAGRE_BOOKMARKS_UI_H__ */ + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-commands.c vinagre-2.29.1/vinagre/vinagre-commands.c --- vinagre-2.26.1/vinagre/vinagre-commands.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-commands.c 2009-10-24 22:01:23.000000000 +0100 @@ -0,0 +1,356 @@ +/* + * vinagre-commands.c + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include "vinagre-commands.h" +#include "vinagre-utils.h" +#include "vinagre-connection.h" +#include "vinagre-notebook.h" +#include "vinagre-tab.h" +#include "vinagre-connect.h" +#include "vinagre-bookmarks.h" +#include "vinagre-bookmarks-ui.h" +#include "vinagre-fav.h" +#include "vinagre-window-private.h" +#include "vinagre-prefs.h" +#include "vinagre-plugin.h" +#include "vinagre-plugin-info.h" +#include "vinagre-plugin-info-priv.h" +#include "vinagre-plugins-engine.h" + +void +vinagre_cmd_direct_connect (VinagreConnection *conn, + VinagreWindow *window) +{ + VinagreTab *tab; + + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + tab = vinagre_window_conn_exists (window, conn); + if (tab) + { + vinagre_window_set_active_tab (window, tab); + } + else + { + tab = VINAGRE_TAB (vinagre_tab_new (conn, window)); + vinagre_notebook_add_tab (VINAGRE_NOTEBOOK (window->priv->notebook), + VINAGRE_TAB (tab), + -1); + } +} + +/* Machine Menu */ +void +vinagre_cmd_machine_connect (GtkAction *action, + VinagreWindow *window) +{ + VinagreTab *tab; + VinagreConnection *conn; + + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + conn = vinagre_connect (window); + if (!conn) + return; + + tab = vinagre_window_conn_exists (window, conn); + if (tab) + { + vinagre_window_set_active_tab (window, tab); + } + else + { + tab = VINAGRE_TAB (vinagre_tab_new (conn, window)); + vinagre_notebook_add_tab (VINAGRE_NOTEBOOK (window->priv->notebook), + VINAGRE_TAB (tab), + -1); + } + + g_object_unref (conn); +} + +static void +vinagre_cmd_free_string_list (gpointer str, gpointer user_data) +{ + g_free (str); +} + +void +vinagre_cmd_machine_open (GtkAction *action, + VinagreWindow *window) +{ + GtkWidget *tab; + VinagreConnection *conn; + GtkWidget *dialog; + GtkFileFilter *filter; + GSList *files, *l; + gchar *uri; + gchar *error = NULL; + GSList *plugins, *errors = NULL; + gint i; + + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + dialog = gtk_file_chooser_dialog_new (_("Choose the file"), + GTK_WINDOW (window), + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + + gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE); + gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); + + plugins = (GSList *) vinagre_plugins_engine_get_plugin_list (vinagre_plugins_engine_get_default ()); + i = 0; + for (; plugins; plugins = plugins->next) + { + VinagrePluginInfo *info = VINAGRE_PLUGIN_INFO (plugins->data); + + if (!vinagre_plugin_info_is_active (info)) + continue; + + filter = vinagre_plugin_get_file_filter (info->plugin); + if (filter) + { + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + i++; + } + } + if (i == 0) + { + vinagre_utils_show_error (_("There are none supported files"), _("None of the active plugins offer a supported file to be open. Activate some plugins and try again."), GTK_WINDOW (window)); + goto finalize; + } + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + files = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog)); + for (l = files; l; l = l->next) + { + uri = (gchar *)l->data; + conn = vinagre_connection_new_from_file (uri, &error, FALSE); + + if (conn) + { + tab = vinagre_tab_new (conn, window); + vinagre_notebook_add_tab (VINAGRE_NOTEBOOK (window->priv->notebook), + VINAGRE_TAB (tab), + -1); + g_object_unref (conn); + } + else + { + errors = g_slist_append (errors, g_strdup_printf ("%s: %s", uri, error?error:_("Unknown error"))); + g_free (error); + } + + g_free (uri); + } + g_slist_free (files); + } + + if (errors) + { + vinagre_utils_show_many_errors (ngettext ("The following file could not be opened:", + "The following files could not be opened:", + g_slist_length (errors)), + errors, + GTK_WINDOW (window)); + g_slist_foreach (errors, vinagre_cmd_free_string_list, NULL); + g_slist_free (errors); + } + +finalize: + gtk_widget_destroy (dialog); +} + +void +vinagre_cmd_machine_close (GtkAction *action, + VinagreWindow *window) +{ + vinagre_window_close_active_tab (window); +} + +void +vinagre_cmd_machine_take_screenshot (GtkAction *action, + VinagreWindow *window) +{ + vinagre_tab_take_screenshot (vinagre_window_get_active_tab (window)); +} + +void +vinagre_cmd_machine_close_all (GtkAction *action, + VinagreWindow *window) +{ + vinagre_window_close_all_tabs (window); +} + +void +vinagre_cmd_machine_quit (GtkAction *action, + VinagreWindow *window) +{ + gtk_widget_destroy (GTK_WIDGET (window)); +} + +/* Edit Menu */ +void +vinagre_cmd_edit_preferences (GtkAction *action, + VinagreWindow *window) +{ + vinagre_prefs_dialog_show (window); +} + +void +vinagre_cmd_edit_plugins (GtkAction *action, + VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + vinagre_plugin_dialog_show (GTK_WINDOW (window)); +} + +/* View Menu */ +void +vinagre_cmd_view_show_toolbar (GtkAction *action, + VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + vinagre_utils_toggle_widget_visible (window->priv->toolbar); + + g_object_set (vinagre_prefs_get_default (), + "toolbar-visible", GTK_WIDGET_VISIBLE (window->priv->toolbar), + NULL); +} + +void +vinagre_cmd_view_show_statusbar (GtkAction *action, + VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + vinagre_utils_toggle_widget_visible (window->priv->statusbar); + + g_object_set (vinagre_prefs_get_default (), + "statusbar-visible", GTK_WIDGET_VISIBLE (window->priv->statusbar), + NULL); +} + +void +vinagre_cmd_view_show_fav_panel (GtkAction *action, + VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + vinagre_utils_toggle_widget_visible (window->priv->fav_panel); + + g_object_set (vinagre_prefs_get_default (), + "side-panel-visible", GTK_WIDGET_VISIBLE (window->priv->fav_panel), + NULL); +} + +void +vinagre_cmd_view_fullscreen (GtkAction *action, + VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + vinagre_window_toggle_fullscreen (window); +} + +/* Bookmarks Menu */ +void +vinagre_cmd_open_bookmark (VinagreWindow *window, + VinagreConnection *conn) +{ + VinagreTab *tab; + VinagreConnection *new_conn; + + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + tab = vinagre_window_conn_exists (window, conn); + if (tab) + { + vinagre_window_set_active_tab (window, tab); + } + else + { + tab = VINAGRE_TAB (vinagre_tab_new (conn, window)); + vinagre_notebook_add_tab (VINAGRE_NOTEBOOK (window->priv->notebook), + VINAGRE_TAB (tab), + -1); + } +} + +void +vinagre_cmd_bookmarks_add (GtkAction *action, + VinagreWindow *window) +{ + VinagreTab *tab; + VinagreConnection *conn; + + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + tab = vinagre_window_get_active_tab (window); + g_return_if_fail (VINAGRE_IS_TAB (tab)); + + conn = vinagre_tab_get_conn (tab); + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + vinagre_bookmarks_add (vinagre_bookmarks_get_default (), + conn, + GTK_WINDOW (window)); + + if (vinagre_window_get_active_tab (window) == tab) + { + gchar *name = vinagre_connection_get_best_name (conn); + vinagre_tab_set_title (tab, name); + g_free (name); + } +} + +/* Help Menu */ + +void +vinagre_cmd_help_contents (GtkAction *action, + VinagreWindow *window) +{ + vinagre_utils_help_contents (GTK_WINDOW (window)); +} + +void +vinagre_cmd_help_about (GtkAction *action, + VinagreWindow *window) +{ + vinagre_utils_help_about (GTK_WINDOW (window)); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-commands.h vinagre-2.29.1/vinagre/vinagre-commands.h --- vinagre-2.26.1/vinagre/vinagre-commands.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-commands.h 2009-10-24 22:10:33.000000000 +0100 @@ -0,0 +1,77 @@ +/* + * vinagre-commands.h + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_COMMANDS_H__ +#define __VINAGRE_COMMANDS_H__ + +#include +#include "vinagre-window.h" +#include "vinagre-connection.h" + +G_BEGIN_DECLS + +void vinagre_cmd_direct_connect (VinagreConnection *conn, + VinagreWindow *window); + +void vinagre_cmd_machine_connect (GtkAction *action, + VinagreWindow *window); +void vinagre_cmd_machine_open (GtkAction *action, + VinagreWindow *window); +void vinagre_cmd_machine_close (GtkAction *action, + VinagreWindow *window); +void vinagre_cmd_machine_take_screenshot (GtkAction *action, + VinagreWindow *window); + +void vinagre_cmd_machine_close_all (GtkAction *action, + VinagreWindow *window); +void vinagre_cmd_machine_quit (GtkAction *action, + VinagreWindow *window); + +void vinagre_cmd_edit_preferences (GtkAction *action, + VinagreWindow *window); + +void vinagre_cmd_edit_plugins (GtkAction *action, + VinagreWindow *window); + +void vinagre_cmd_view_show_toolbar (GtkAction *action, + VinagreWindow *window); +void vinagre_cmd_view_show_statusbar (GtkAction *action, + VinagreWindow *window); +void vinagre_cmd_view_show_fav_panel (GtkAction *action, + VinagreWindow *window); +void vinagre_cmd_view_fullscreen (GtkAction *action, + VinagreWindow *window); + +void vinagre_cmd_open_bookmark (VinagreWindow *window, + VinagreConnection *conn); +void vinagre_cmd_bookmarks_add (GtkAction *action, + VinagreWindow *window); + +void vinagre_cmd_help_contents (GtkAction *action, + VinagreWindow *window); +void vinagre_cmd_help_about (GtkAction *action, + VinagreWindow *window); + + + +G_END_DECLS + +#endif /* __VINAGRE_COMMANDS_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-connect.c vinagre-2.29.1/vinagre/vinagre-connect.c --- vinagre-2.26.1/vinagre/vinagre-connect.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-connect.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,480 @@ +/* + * vinagre-connect.c + * This file is part of vinagre + * + * Copyright (C) 2007 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#ifdef VINAGRE_ENABLE_AVAHI +#include +#endif + +#include "vinagre-connect.h" +#include "vinagre-utils.h" +#include "vinagre-bookmarks.h" +#include "vinagre-prefs.h" +#include "vinagre-plugins-engine.h" +#include "vinagre-plugin.h" + +typedef struct { + GtkBuilder *xml; + GtkWidget *dialog; + GtkWidget *protocol_combo; + GtkWidget *protocol_description_label; + GtkListStore *protocol_store; + GtkWidget *host_entry; + GtkWidget *find_button; + GtkWidget *fullscreen_check; + GtkWidget *plugin_box; + GtkWidget *connect_button; +} VinagreConnectDialog; + +enum { + COLUMN_TEXT, + N_COLUMNS +}; + +enum { + PROTOCOL_NAME, + PROTOCOL_DESCRIPTION, + PROTOCOL_MDNS, + PROTOCOL_OPTIONS, + PROTOCOL_PLUGIN, + N_PROTOCOLS +}; + +static gchar* +history_filename () { + return g_build_filename (g_get_user_data_dir (), + "vinagre", + "history", + NULL); +} + +static void +protocol_combo_changed (GtkComboBox *combo, VinagreConnectDialog *dialog) +{ + GtkTreeIter tree_iter; + gchar *description, *service; + GtkWidget *options; + GList *children, *l; + + if (!gtk_combo_box_get_active_iter (combo, &tree_iter)) + { + g_warning (_("Could not get the active protocol in the protocol list.")); + return; + } + + gtk_tree_model_get (GTK_TREE_MODEL (dialog->protocol_store), &tree_iter, + PROTOCOL_DESCRIPTION, &description, + PROTOCOL_MDNS, &service, + PROTOCOL_OPTIONS, &options, + -1); + + gtk_label_set_label (GTK_LABEL (dialog->protocol_description_label), + description); + +#ifdef VINAGRE_ENABLE_AVAHI + if (service) + gtk_widget_show (dialog->find_button); + else + gtk_widget_hide (dialog->find_button); +#endif + + children = gtk_container_get_children (GTK_CONTAINER (dialog->plugin_box)); + for (l = children; l; l = l->next) + gtk_container_remove (GTK_CONTAINER (dialog->plugin_box), GTK_WIDGET (l->data)); + g_list_free (children); + + if (options) + { + gtk_box_pack_start (GTK_BOX (dialog->plugin_box), options, TRUE, TRUE, 0); + gtk_widget_show_all (dialog->plugin_box); + } + else + gtk_widget_hide (dialog->plugin_box); + + g_free (description); + g_free (service); +} + +static void +setup_protocol (VinagreConnectDialog *dialog) +{ + GHashTable *plugins; + GHashTableIter hash_iter; + gpointer key, value; + GtkTreeIter tree_iter; + GtkCellRenderer *rend; + gchar *last_protocol; + gint selected, i; + + dialog->protocol_store = gtk_list_store_new (N_PROTOCOLS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT, G_TYPE_OBJECT); + plugins = vinagre_plugin_engine_get_plugins_by_protocol (vinagre_plugins_engine_get_default ()); + g_object_get (vinagre_prefs_get_default (), "last-protocol", &last_protocol, NULL); + + g_hash_table_iter_init (&hash_iter, plugins); + selected = 0; + i = 0; + while (g_hash_table_iter_next (&hash_iter, &key, &value)) + { + gchar **description; + VinagrePlugin *plugin = VINAGRE_PLUGIN (value); + GtkWidget *widget; + + description = vinagre_plugin_get_public_description (plugin); + if (!description || !description[0]) + continue; + + widget = vinagre_plugin_get_connect_widget (plugin, NULL); + + gtk_list_store_append (dialog->protocol_store, &tree_iter); + gtk_list_store_set (dialog->protocol_store, &tree_iter, + PROTOCOL_NAME, description[0], + PROTOCOL_DESCRIPTION, description[1], + PROTOCOL_MDNS, vinagre_plugin_get_mdns_service (plugin), + PROTOCOL_OPTIONS, widget, + PROTOCOL_PLUGIN, plugin, + -1); + + if (last_protocol && g_str_equal (last_protocol, description[0])) + selected = i; + + g_strfreev (description); + if (widget) + g_object_unref (widget); + i++; + } + + gtk_combo_box_set_model (GTK_COMBO_BOX (dialog->protocol_combo), + GTK_TREE_MODEL (dialog->protocol_store)); + rend = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (dialog->protocol_combo), rend, TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (dialog->protocol_combo), rend, "text", 0); + + g_signal_connect (dialog->protocol_combo, + "changed", + G_CALLBACK (protocol_combo_changed), + dialog); + gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->protocol_combo), selected); + g_free (last_protocol); +} + +static GPtrArray * +saved_history (void) +{ + gchar *filename, *file_contents = NULL; + gchar **history_from_file = NULL, **list; + gboolean success; + gint len; + GPtrArray *array; + + array = g_ptr_array_new (); + + filename = history_filename (); + success = g_file_get_contents (filename, + &file_contents, + NULL, + NULL); + + if (success) + { + history_from_file = g_strsplit (file_contents, "\n", 0); + len = g_strv_length (history_from_file); + if (strlen (history_from_file[len-1]) == 0) + { + g_free (history_from_file[len-1]); + history_from_file[len-1] = NULL; + } + + list = history_from_file; + + while (*list != NULL) + g_ptr_array_add (array, *list++); + } + + g_free (filename); + g_free (file_contents); + return array; +} + +static void +control_connect_button (GtkEditable *entry, VinagreConnectDialog *dialog) +{ + gtk_widget_set_sensitive (dialog->connect_button, + gtk_entry_get_text_length (GTK_ENTRY (entry)) > 0); +} + +static void +setup_combo (VinagreConnectDialog *dialog) +{ + GtkListStore *store; + GtkTreeIter iter; + GtkEntryCompletion *completion; + GPtrArray *history; + gint i, size; + GtkEntry *entry; + + entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (dialog->host_entry))); + store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING); + + history = saved_history (); + + g_object_get (vinagre_prefs_get_default (), "history-size", &size, NULL); + if (size <= 0) + size = G_MAXINT; + + for (i=history->len-1; i>=0 && i>=(gint)history->len-size; i--) + { + GtkTreeIter iter; + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, COLUMN_TEXT, g_ptr_array_index (history, i), -1); + } + g_ptr_array_free (history, TRUE); + + gtk_combo_box_set_model (GTK_COMBO_BOX (dialog->host_entry), + GTK_TREE_MODEL (store)); + gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (dialog->host_entry), + 0); + + completion = gtk_entry_completion_new (); + gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (store)); + gtk_entry_completion_set_text_column (completion, 0); + gtk_entry_completion_set_inline_completion (completion, TRUE); + gtk_entry_set_completion (entry, completion); + g_object_unref (completion); + + gtk_entry_set_activates_default (entry, TRUE); + g_signal_connect (entry, "changed", G_CALLBACK (control_connect_button), dialog); +} + +static void +save_history (GtkWidget *combo) { + gchar *host; + GPtrArray *history; + guint i; + gchar *filename, *path; + GString *content; + GError *error = NULL; + + host = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo)); + + history = saved_history (); + for (i=0; ilen; i++) + if (!g_strcmp0 (g_ptr_array_index (history, i), host)) + { + g_ptr_array_remove_index (history, i); + break; + } + + g_ptr_array_add (history, host); + content = g_string_new (NULL); + + for (i=0; ilen; i++) + g_string_append_printf (content, "%s\n", (char *) g_ptr_array_index (history, i)); + + filename = history_filename (); + path = g_path_get_dirname (filename); + g_mkdir_with_parents (path, 0755); + + g_file_set_contents (filename, + content->str, + -1, + &error); + + g_free (filename); + g_free (path); + g_ptr_array_free (history, TRUE); + g_string_free (content, TRUE); + + if (error) { + g_warning (_("Error while saving history file: %s"), error->message); + g_error_free (error); + } +} + +#ifdef VINAGRE_ENABLE_AVAHI +static void +vinagre_connect_find_button_cb (GtkButton *button, + VinagreConnectDialog *dialog) +{ + GtkWidget *d; + GtkTreeIter tree_iter; + gchar *service; + + if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->protocol_combo), + &tree_iter)) + { + g_warning (_("Could not get the active protocol in the protocol list.")); + return; + } + + gtk_tree_model_get (GTK_TREE_MODEL (dialog->protocol_store), &tree_iter, + PROTOCOL_MDNS, &service, + -1); + if (!service) + return; + + d = aui_service_dialog_new (_("Choose a Remote Desktop"), + GTK_WINDOW(dialog->dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); + gtk_window_set_transient_for (GTK_WINDOW(d), GTK_WINDOW(dialog->dialog)); + aui_service_dialog_set_resolve_service (AUI_SERVICE_DIALOG(d), TRUE); + aui_service_dialog_set_resolve_host_name (AUI_SERVICE_DIALOG(d), TRUE); + aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG(d), + service, + NULL); + + if (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_ACCEPT) + { + gchar *tmp; + char a[AVAHI_ADDRESS_STR_MAX]; + + avahi_address_snprint (a, + sizeof(a), + aui_service_dialog_get_address (AUI_SERVICE_DIALOG (d))); + tmp = g_strdup_printf ("%s::%d", + a, + aui_service_dialog_get_port (AUI_SERVICE_DIALOG (d))); + + gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (dialog->host_entry))), + tmp); + + g_free (tmp); + } + + g_free (service); + gtk_widget_destroy (d); +} +#endif + +VinagreConnection *vinagre_connect (VinagreWindow *window) +{ + VinagreConnection *conn = NULL; + gint result; + VinagreConnectDialog dialog; + + dialog.xml = vinagre_utils_get_builder (NULL, NULL); + + dialog.dialog = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "connect_dialog")); + gtk_window_set_transient_for (GTK_WINDOW (dialog.dialog), GTK_WINDOW (window)); + + dialog.protocol_combo = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "protocol_combo")); + dialog.protocol_description_label = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "protocol_description_label")); + dialog.host_entry = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "host_entry")); + dialog.find_button = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "find_button")); + dialog.fullscreen_check = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "fullscreen_check")); + dialog.plugin_box = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "plugin_options_connect_vbox")); + dialog.connect_button = GTK_WIDGET (gtk_builder_get_object (dialog.xml, "connect_button")); + + setup_protocol (&dialog); + setup_combo (&dialog); + +#ifdef VINAGRE_ENABLE_AVAHI + g_signal_connect (dialog.find_button, + "clicked", + G_CALLBACK (vinagre_connect_find_button_cb), + &dialog); +#else + gtk_widget_hide (dialog.find_button); + gtk_widget_set_no_show_all (dialog.find_button, TRUE); +#endif + + gtk_widget_show_all (dialog.dialog); + result = gtk_dialog_run (GTK_DIALOG (dialog.dialog)); + + if (result == GTK_RESPONSE_OK) + { + gchar *host = NULL, *error_msg = NULL, *protocol = NULL, *actual_host; + gint port; + VinagrePlugin *plugin; + GtkWidget *options; + GtkTreeIter iter; + + host = gtk_combo_box_get_active_text (GTK_COMBO_BOX (dialog.host_entry)); + gtk_widget_hide (GTK_WIDGET (dialog.dialog)); + + if (!host || !g_strcmp0 (host, "")) + goto fail; + + save_history (dialog.host_entry); + + if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog.protocol_combo), &iter)) + { + g_warning (_("Could not get the active protocol in the protocol list.")); + goto fail; + } + + gtk_tree_model_get (GTK_TREE_MODEL (dialog.protocol_store), &iter, + PROTOCOL_NAME, &protocol, + PROTOCOL_OPTIONS, &options, + PROTOCOL_PLUGIN, &plugin, + -1); + + g_object_set (vinagre_prefs_get_default (), "last-protocol", protocol, NULL); + g_free (protocol); + + conn = vinagre_plugin_new_connection (plugin); + if (vinagre_connection_split_string (host, + vinagre_connection_get_protocol (conn), + &protocol, + &actual_host, + &port, + &error_msg)) + { + g_object_set (conn, + "host", actual_host, + "port", port, + "fullscreen", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog.fullscreen_check)), + NULL); + + if (options) + vinagre_connection_parse_options_widget (conn, options); + + g_free (protocol); + g_free (actual_host); + } + else + { + vinagre_utils_show_error (NULL, error_msg ? error_msg : _("Unknown error"), + GTK_WINDOW (window)); + } + + g_object_unref (plugin); + if (options) + g_object_unref (options); + +fail: + g_free (host); + g_free (error_msg); + } + + gtk_widget_destroy (dialog.dialog); + g_object_unref (dialog.xml); + return conn; +} +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-connect.h vinagre-2.29.1/vinagre/vinagre-connect.h --- vinagre-2.26.1/vinagre/vinagre-connect.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-connect.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,23 @@ +/* + * vinagre-connect.h + * This file is part of vinagre + * + * Copyright (C) 2007 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "vinagre-window.h" + +VinagreConnection *vinagre_connect (VinagreWindow *window); diff -Nru vinagre-2.26.1/vinagre/vinagre-connection.c vinagre-2.29.1/vinagre/vinagre-connection.c --- vinagre-2.26.1/vinagre/vinagre-connection.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-connection.c 2009-08-10 18:21:39.000000000 +0100 @@ -0,0 +1,724 @@ +/* + * vinagre-connection.c + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include + +#include "vinagre-connection.h" +#include "vinagre-enums.h" +#include "vinagre-bookmarks.h" +#include "vinagre-plugin.h" +#include "vinagre-plugins-engine.h" + +struct _VinagreConnectionPrivate +{ + gchar *protocol; + gchar *host; + gint port; + gchar *username; + gchar *password; + gchar *name; + gboolean fullscreen; +}; + +enum +{ + PROP_0, + PROP_PROTOCOL, + PROP_HOST, + PROP_PORT, + PROP_USERNAME, + PROP_PASSWORD, + PROP_NAME, + PROP_BEST_NAME, + PROP_FULLSCREEN +}; + +#define VINAGRE_CONNECTION_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VINAGRE_TYPE_CONNECTION, VinagreConnectionPrivate)) +G_DEFINE_ABSTRACT_TYPE (VinagreConnection, vinagre_connection, G_TYPE_OBJECT); + +static void +vinagre_connection_init (VinagreConnection *conn) +{ + conn->priv = G_TYPE_INSTANCE_GET_PRIVATE (conn, VINAGRE_TYPE_CONNECTION, VinagreConnectionPrivate); + + conn->priv->protocol = NULL; + conn->priv->host = NULL; + conn->priv->port = 0; + conn->priv->password = NULL; + conn->priv->username = NULL; + conn->priv->name = NULL; + conn->priv->fullscreen = FALSE; +} + +static void +vinagre_connection_finalize (GObject *object) +{ + VinagreConnection *conn = VINAGRE_CONNECTION (object); + + g_free (conn->priv->protocol); + g_free (conn->priv->host); + g_free (conn->priv->username); + g_free (conn->priv->password); + g_free (conn->priv->name); + + G_OBJECT_CLASS (vinagre_connection_parent_class)->finalize (object); +} + +static void +vinagre_connection_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +{ + VinagreConnection *conn; + + g_return_if_fail (VINAGRE_IS_CONNECTION (object)); + + conn = VINAGRE_CONNECTION (object); + + switch (prop_id) + { + case PROP_PROTOCOL: + vinagre_connection_set_protocol (conn, g_value_get_string (value)); + break; + + case PROP_HOST: + vinagre_connection_set_host (conn, g_value_get_string (value)); + break; + + case PROP_PORT: + vinagre_connection_set_port (conn, g_value_get_int (value)); + break; + + case PROP_USERNAME: + vinagre_connection_set_username (conn, g_value_get_string (value)); + break; + + case PROP_PASSWORD: + vinagre_connection_set_password (conn, g_value_get_string (value)); + break; + + case PROP_FULLSCREEN: + vinagre_connection_set_fullscreen (conn, g_value_get_boolean (value)); + break; + + case PROP_NAME: + vinagre_connection_set_name (conn, g_value_get_string (value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_connection_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + VinagreConnection *conn; + + g_return_if_fail (VINAGRE_IS_CONNECTION (object)); + + conn = VINAGRE_CONNECTION (object); + + + switch (prop_id) + { + case PROP_PROTOCOL: + g_value_set_string (value, conn->priv->protocol); + break; + + case PROP_HOST: + g_value_set_string (value, conn->priv->host); + break; + + case PROP_PORT: + g_value_set_int (value, conn->priv->port); + break; + + case PROP_USERNAME: + g_value_set_string (value, conn->priv->username); + break; + + case PROP_PASSWORD: + g_value_set_string (value, conn->priv->password); + break; + + case PROP_FULLSCREEN: + g_value_set_boolean (value, conn->priv->fullscreen); + break; + + case PROP_NAME: + g_value_set_string (value, conn->priv->name); + break; + + case PROP_BEST_NAME: + g_value_set_string (value, vinagre_connection_get_best_name (conn)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +default_fill_writer (VinagreConnection *conn, xmlTextWriter *writer) +{ + if (conn->priv->protocol) + xmlTextWriterWriteElement (writer, "protocol", conn->priv->protocol); + xmlTextWriterWriteElement (writer, "name", conn->priv->name); + xmlTextWriterWriteElement (writer, "host", conn->priv->host); + xmlTextWriterWriteFormatElement (writer, "port", "%d", conn->priv->port); + xmlTextWriterWriteFormatElement (writer, "fullscreen", "%d", conn->priv->fullscreen); +} + +static void +default_parse_item (VinagreConnection *conn, xmlNode *root) +{ + xmlNode *curr; + xmlChar *s_value; + + for (curr = root->children; curr; curr = curr->next) + { + s_value = xmlNodeGetContent (curr); + + if (!xmlStrcmp(curr->name, (const xmlChar *)"host")) + vinagre_connection_set_host (conn, s_value); + else if (!xmlStrcmp(curr->name, (const xmlChar *)"name")) + vinagre_connection_set_name (conn, s_value); + else if (!xmlStrcmp(curr->name, (const xmlChar *)"port")) + vinagre_connection_set_port (conn, atoi (s_value)); + else if (!xmlStrcmp(curr->name, (const xmlChar *)"fullscreen")) + vinagre_connection_set_fullscreen (conn, vinagre_utils_parse_boolean (s_value)); + + xmlFree (s_value); + } +} + +static gchar * +default_get_best_name (VinagreConnection *conn) +{ + if (conn->priv->name) + return g_strdup (conn->priv->name); + + if (conn->priv->host) + return vinagre_connection_get_string_rep (conn, FALSE); + + return NULL; +} + +static void +default_parse_options_widget (VinagreConnection *conn, GtkWidget *widget) +{ +} + +static void +vinagre_connection_class_init (VinagreConnectionClass *klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (VinagreConnectionPrivate)); + + object_class->finalize = vinagre_connection_finalize; + object_class->set_property = vinagre_connection_set_property; + object_class->get_property = vinagre_connection_get_property; + + klass->impl_fill_writer = default_fill_writer; + klass->impl_parse_item = default_parse_item; + klass->impl_get_best_name = default_get_best_name; + klass->impl_fill_conn_from_file = NULL; + klass->impl_parse_options_widget = default_parse_options_widget; + + g_object_class_install_property (object_class, + PROP_PROTOCOL, + g_param_spec_string ("protocol", + "protocol", + "connection protocol", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_HOST, + g_param_spec_string ("host", + "hostname", + "hostname or ip address of this connection", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_PORT, + g_param_spec_int ("port", + "port", + "tcp/ip port of this connection", + 0, + G_MAXINT, + 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_NAME, + g_param_spec_string ("username", + "username", + "username (if any) necessary for complete this connection", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_PASSWORD, + g_param_spec_string ("password", + "password", + "password (if any) necessary for complete this connection", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_NAME, + g_param_spec_string ("name", + "connection name", + "friendly name for this connection", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_BEST_NAME, + g_param_spec_string ("best-name", + "best-name", + "preferred name for this connection", + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_FULLSCREEN, + g_param_spec_boolean ("fullscreen", + "Full screen connection", + "Whether this connection is a view-only one", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB)); + +} + +void +vinagre_connection_set_protocol (VinagreConnection *conn, + const gchar *protocol) +{ + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + g_free (conn->priv->protocol); + conn->priv->protocol = g_strdup (protocol); +} +const gchar * +vinagre_connection_get_protocol (VinagreConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); + + return conn->priv->protocol; +} + +void +vinagre_connection_set_host (VinagreConnection *conn, + const gchar *host) +{ + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + g_free (conn->priv->host); + conn->priv->host = g_strdup (host); +} +const gchar * +vinagre_connection_get_host (VinagreConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); + + return conn->priv->host; +} + +void +vinagre_connection_set_port (VinagreConnection *conn, + gint port) +{ + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + conn->priv->port = port; +} +gint +vinagre_connection_get_port (VinagreConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), 0); + + return conn->priv->port; +} + +void +vinagre_connection_set_username (VinagreConnection *conn, + const gchar *username) +{ + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + g_free (conn->priv->username); + conn->priv->username = g_strdup (username); +} +const gchar * +vinagre_connection_get_username (VinagreConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); + + return conn->priv->username; +} + +void +vinagre_connection_set_password (VinagreConnection *conn, + const gchar *password) +{ + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + g_free (conn->priv->password); + conn->priv->password = g_strdup (password); +} +const gchar * +vinagre_connection_get_password (VinagreConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); + + return conn->priv->password; +} + +void +vinagre_connection_set_fullscreen (VinagreConnection *conn, + gboolean value) +{ + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + conn->priv->fullscreen = value; +} +gboolean +vinagre_connection_get_fullscreen (VinagreConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), FALSE); + + return conn->priv->fullscreen; +} + +void +vinagre_connection_set_name (VinagreConnection *conn, + const gchar *name) +{ + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + g_free (conn->priv->name); + conn->priv->name = g_strdup (name); +} +const gchar * +vinagre_connection_get_name (VinagreConnection *conn) +{ + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); + + return conn->priv->name; +} + +/** + * vinagre_connection_split_string: + * @uri: The URI to be splitted. + * @known_protocol: The protocol, if it's known. NULL otherwise. + * @protocol: Will hold the protocol of this URI + * @host: Will hold the host of this URI + * @port: Will hold the port of this URI + * @error_msg: Will hold an error message in case of fail + * + * Splits a URI into its several parts. + * + * Returns: %TRUE if the URI is splitted successfuly. FALSE otherwise. + */ +gboolean +vinagre_connection_split_string (const gchar *uri, + const gchar *known_protocol, + gchar **protocol, + gchar **host, + gint *port, + gchar **error_msg) +{ + gchar **server, **url; + gint lport; + gchar *lhost; + gchar ipv6_host[255] = {0,}; + VinagrePlugin *plugin; + + *error_msg = NULL; + *host = NULL; + *port = 0; + + url = g_strsplit (uri, "://", 2); + if (g_strv_length (url) == 2) + { + if (known_protocol) + *protocol = g_strdup (known_protocol); + else + *protocol = g_strdup (url[0]); + lhost = url[1]; + } + else + { + if (known_protocol) + *protocol = g_strdup (known_protocol); + else + *protocol = g_strdup ("vnc"); + lhost = (gchar *) uri; + } + + plugin = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), + *protocol); + if (!plugin) + { + *error_msg = g_strdup_printf (_("The protocol %s is not supported."), *protocol); + g_free (*protocol); + *protocol = NULL; + g_strfreev (url); + return FALSE; + } + + if (lhost[0] == '[') + { + int i; + for (i = 1; lhost[i] && lhost[i] != ']'; i++) + { + ipv6_host[i-1] = lhost[i]; + lhost[i-1] = '_'; + } + ipv6_host[i-1] = '\0'; + lhost[i] = '_'; + } + + if (g_strrstr (lhost, "::") != NULL) + { + server = g_strsplit (lhost, "::", 2); + lport = server[1] ? atoi (server[1]) : vinagre_plugin_get_default_port (plugin); + } + else + { + server = g_strsplit (lhost, ":", 2); + lport = server[1] ? atoi (server[1]) : vinagre_plugin_get_default_port (plugin); + + if ((g_str_equal (*protocol, "vnc")) && (lport < 1024)) + lport += 5900; + } + + lhost = ipv6_host[0] ? ipv6_host : (server[0][0] ? server[0] : "localhost"); + + *host = g_strdup (lhost); + *port = lport; + + g_strfreev (server); + g_strfreev (url); + + return TRUE; +} + +VinagreConnection * +vinagre_connection_new_from_string (const gchar *uri, gchar **error_msg, gboolean use_bookmarks) +{ + VinagreConnection *conn = NULL; + gint port; + gchar *host, *protocol; + VinagrePlugin *plugin; + + if (!vinagre_connection_split_string (uri, NULL, &protocol, &host, &port, error_msg)) + return NULL; + + if (use_bookmarks) + conn = vinagre_bookmarks_exists (vinagre_bookmarks_get_default (), + protocol, + host, + port); + if (!conn) + { + plugin = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), + protocol); + if (!plugin) + goto finalize; + + conn = vinagre_plugin_new_connection (plugin); + vinagre_connection_set_host (conn, host); + vinagre_connection_set_port (conn, port); + } + +finalize: + g_free (host); + g_free (protocol); + return conn; +} + +VinagreConnection * +vinagre_connection_new_from_file (const gchar *uri, gchar **error_msg, gboolean use_bookmarks) +{ + VinagreConnection *conn; + gchar *data; + GFile *file_a; + GError *error; + GHashTable *plugins; + GHashTableIter iter; + gpointer plugin; + + *error_msg = NULL; + data = NULL; + conn = NULL; + error = NULL; + + file_a = g_file_new_for_commandline_arg (uri); + if (!g_file_load_contents (file_a, + NULL, + &data, + NULL, + NULL, + &error)) + { + if (error) + { + *error_msg = g_strdup (error->message); + g_error_free (error); + } + else + *error_msg = g_strdup (_("Could not open the file.")); + + goto the_end; + } + + plugins = vinagre_plugin_engine_get_plugins_by_protocol (vinagre_plugins_engine_get_default ()); + g_hash_table_iter_init (&iter, plugins); + while (g_hash_table_iter_next (&iter, NULL, &plugin)) + { + conn = vinagre_plugin_new_connection_from_file (VINAGRE_PLUGIN (plugin), + data, + use_bookmarks, + error_msg); + g_free (*error_msg); + *error_msg = NULL; + if (conn) + break; + } + +the_end: + g_free (data); + g_object_unref (file_a); + + if (!conn && !*error_msg) + *error_msg = g_strdup (_("The file was not recognized by any of the plugins.")); + + return conn; +} + +gchar* +vinagre_connection_get_string_rep (VinagreConnection *conn, + gboolean has_protocol) +{ + GString *uri; + gchar *result; + gboolean is_ipv6; + VinagrePlugin *plugin; + + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); + + is_ipv6 = g_strstr_len (conn->priv->host, -1, ":") != NULL; + + if (has_protocol) + { + uri = g_string_new (conn->priv->protocol); + g_string_append (uri, "://"); + } + else + uri = g_string_new (NULL); + + if (is_ipv6) + g_string_append_c (uri, '['); + g_string_append (uri, conn->priv->host); + if (is_ipv6) + g_string_append_c (uri, ']'); + + plugin = g_hash_table_lookup (vinagre_plugin_engine_get_plugins_by_protocol (vinagre_plugins_engine_get_default ()), + conn->priv->protocol); + if (plugin) + if (vinagre_plugin_get_default_port (plugin) != conn->priv->port) + g_string_append_printf (uri, "::%d", conn->priv->port); + + result = uri->str; + g_string_free (uri, FALSE); + + return result; +} + +void +vinagre_connection_fill_writer (VinagreConnection *conn, + xmlTextWriter *writer) +{ + VINAGRE_CONNECTION_GET_CLASS (conn)->impl_fill_writer (conn, writer); +} + +void +vinagre_connection_parse_item (VinagreConnection *conn, + xmlNode *root) +{ + VINAGRE_CONNECTION_GET_CLASS (conn)->impl_parse_item (conn, root); +} + +gchar* +vinagre_connection_get_best_name (VinagreConnection *conn) +{ + return VINAGRE_CONNECTION_GET_CLASS (conn)->impl_get_best_name (conn); +} + +void +vinagre_connection_parse_options_widget (VinagreConnection *conn, + GtkWidget *widget) +{ + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + g_return_if_fail (GTK_IS_WIDGET (widget)); + + VINAGRE_CONNECTION_GET_CLASS (conn)->impl_parse_options_widget (conn, widget); +} +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-connection.h vinagre-2.29.1/vinagre/vinagre-connection.h --- vinagre-2.26.1/vinagre/vinagre-connection.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-connection.h 2009-08-01 00:24:09.000000000 +0100 @@ -0,0 +1,123 @@ +/* + * vinagre-connection.h + * Abstract base class for all types of connections: VNC, RDP, etc. + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_CONNECTION_H__ +#define __VINAGRE_CONNECTION_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_CONNECTION (vinagre_connection_get_type ()) +#define VINAGRE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_CONNECTION, VinagreConnection)) +#define VINAGRE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_CONNECTION, VinagreConnectionClass)) +#define VINAGRE_IS_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_CONNECTION)) +#define VINAGRE_IS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_CONNECTION)) +#define VINAGRE_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_CONNECTION, VinagreConnectionClass)) + +typedef struct _VinagreConnectionClass VinagreConnectionClass; +typedef struct _VinagreConnection VinagreConnection; +typedef struct _VinagreConnectionPrivate VinagreConnectionPrivate; + +struct _VinagreConnectionClass +{ + GObjectClass parent_class; + + /* Virtual functions */ + void (*impl_fill_writer) (VinagreConnection *conn, xmlTextWriter *writer); + void (*impl_parse_item) (VinagreConnection *conn, xmlNode *root); + gchar * (*impl_get_best_name) (VinagreConnection *conn); + void (*impl_fill_conn_from_file) (VinagreConnection *conn, GKeyFile *file); + void (*impl_parse_options_widget) (VinagreConnection *conn, GtkWidget *widget); +}; + +struct _VinagreConnection +{ + GObject parent_instance; + VinagreConnectionPrivate *priv; +}; + + +GType vinagre_connection_get_type (void) G_GNUC_CONST; + +const gchar* vinagre_connection_get_protocol (VinagreConnection *conn); +void vinagre_connection_set_protocol (VinagreConnection *conn, + const gchar *protocol); + +const gchar* vinagre_connection_get_host (VinagreConnection *conn); +void vinagre_connection_set_host (VinagreConnection *conn, + const gchar *host); + +gint vinagre_connection_get_port (VinagreConnection *conn); +void vinagre_connection_set_port (VinagreConnection *conn, + gint port); + +const gchar* vinagre_connection_get_username (VinagreConnection *conn); +void vinagre_connection_set_username (VinagreConnection *conn, + const gchar *username); + +const gchar* vinagre_connection_get_password (VinagreConnection *conn); +void vinagre_connection_set_password (VinagreConnection *conn, + const gchar *password); + +const gchar* vinagre_connection_get_name (VinagreConnection *conn); +void vinagre_connection_set_name (VinagreConnection *conn, + const gchar *name); + +gboolean vinagre_connection_get_fullscreen (VinagreConnection *conn); +void vinagre_connection_set_fullscreen (VinagreConnection *conn, + gboolean value); + +VinagreConnection* vinagre_connection_new_from_string (const gchar *url, gchar **error_msg, gboolean use_bookmarks); +VinagreConnection* vinagre_connection_new_from_file (const gchar *uri, gchar **error_msg, gboolean use_bookmarks); + +gboolean vinagre_connection_split_string (const gchar *uri, + const gchar *known_protocol, + gchar **protocol, + gchar **host, + gint *port, + gchar **error_msg); + +gchar* vinagre_connection_get_string_rep (VinagreConnection *conn, + gboolean has_protocol); + +/* Methods that can be overrided */ + +/* vinagre_connection_fill_writer(): Used to fill a xml writer when saving bookmarks. + subclasses must inherit from it and call super() */ +void vinagre_connection_fill_writer (VinagreConnection *conn, + xmlTextWriter *writer); + +/* vinagre_connection_parse_item(): Used to parse a xml item when loading bookmarks. + subclasses must inherit from it and call super() */ +void vinagre_connection_parse_item (VinagreConnection *conn, + xmlNode *root); + +gchar* vinagre_connection_get_best_name (VinagreConnection *conn); + +void vinagre_connection_parse_options_widget (VinagreConnection *conn, GtkWidget *widget); + +G_END_DECLS + +#endif /* __VINAGRE_CONNECTION_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-debug.c vinagre-2.29.1/vinagre/vinagre-debug.c --- vinagre-2.26.1/vinagre/vinagre-debug.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-debug.c 2009-07-27 15:51:33.000000000 +0100 @@ -0,0 +1,138 @@ +/* + * vinagre-debug.c + * This file is part of vinagre + * + * Based on gedit code + * Copyright (C) 1998, 1999 Alex Roberts, Evan Lawrence + * Copyright (C) 2000, 2001 Chema Celorio, Paolo Maggi + * Copyright (C) 2002 - 2005 Paolo Maggi + * + * vinagre-debug.c 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. + * + * vinagre-debug.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include "vinagre-debug.h" + +/* #define ENABLE_PROFILING */ + +#ifdef ENABLE_PROFILING +static GTimer *timer = NULL; +static gdouble last = 0.0; +#endif + +static VinagreDebugSection debug = VINAGRE_NO_DEBUG; + +void +vinagre_debug_init () +{ + if (g_getenv ("VINAGRE_DEBUG") != NULL) + { + /* enable all debugging */ + debug = ~VINAGRE_NO_DEBUG; + goto out; + } + + if (g_getenv ("VINAGRE_DEBUG_VIEW") != NULL) + debug = debug | VINAGRE_DEBUG_VIEW; + if (g_getenv ("VINAGRE_DEBUG_PREFS") != NULL) + debug = debug | VINAGRE_DEBUG_PREFS; + if (g_getenv ("VINAGRE_DEBUG_PRINT") != NULL) + debug = debug | VINAGRE_DEBUG_PRINT; + if (g_getenv ("VINAGRE_DEBUG_PLUGINS") != NULL) + debug = debug | VINAGRE_DEBUG_PLUGINS; + if (g_getenv ("VINAGRE_DEBUG_UTILS") != NULL) + debug = debug | VINAGRE_DEBUG_UTILS; + if (g_getenv ("VINAGRE_DEBUG_WINDOW") != NULL) + debug = debug | VINAGRE_DEBUG_WINDOW; + if (g_getenv ("VINAGRE_DEBUG_LOADER") != NULL) + debug = debug | VINAGRE_DEBUG_LOADER; + if (g_getenv ("VINAGRE_DEBUG_APP") != NULL) + debug = debug | VINAGRE_DEBUG_APP; + if (g_getenv ("VINAGRE_DEBUG_TUBE") != NULL) + debug = debug | VINAGRE_DEBUG_TUBE; + +out: + +#ifdef ENABLE_PROFILING + if (debug != VINAGRE_NO_DEBUG) + timer = g_timer_new (); +#endif + return; +} + +void +vinagre_debug_message (VinagreDebugSection section, + const gchar *file, + gint line, + const gchar *function, + const gchar *format, ...) +{ + if (G_UNLIKELY (debug & section)) + { +#ifdef ENABLE_PROFILING + gdouble seconds; +#endif + + va_list args; + gchar *msg; + + g_return_if_fail (format != NULL); + + va_start (args, format); + msg = g_strdup_vprintf (format, args); + va_end (args); + +#ifdef ENABLE_PROFILING + g_return_if_fail (timer != NULL); + + seconds = g_timer_elapsed (timer, NULL); + g_print ("[%f (%f)] %s:%d (%s) %s\n", + seconds, seconds - last, file, line, function, msg); + last = seconds; +#else + g_print ("%s:%d (%s) %s\n", file, line, function, msg); +#endif + + fflush (stdout); + g_free (msg); + } +} + +void vinagre_debug (VinagreDebugSection section, + const gchar *file, + gint line, + const gchar *function) +{ + if (G_UNLIKELY (debug & section)) + { +#ifdef ENABLE_PROFILING + gdouble seconds; + + g_return_if_fail (timer != NULL); + + seconds = g_timer_elapsed (timer, NULL); + g_print ("[%f (%f)] %s:%d (%s)\n", + seconds, seconds - last, file, line, function); + last = seconds; +#else + g_print ("%s:%d (%s)\n", file, line, function); +#endif + fflush (stdout); + } +} +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-debug.h vinagre-2.29.1/vinagre/vinagre-debug.h --- vinagre-2.26.1/vinagre/vinagre-debug.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-debug.h 2009-07-27 15:51:16.000000000 +0100 @@ -0,0 +1,73 @@ +/* + * vinagre-debug.h + * This file is part of vinagre + * + * Based on gedit code + * Copyright (C) 1998, 1999 Alex Roberts, Evan Lawrence + * Copyright (C) 2000, 2001 Chema Celorio, Paolo Maggi + * Copyright (C) 2002 - 2005 Paolo Maggi + * + * vinagre-debug.h 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. + * + * vinagre-debug.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_DEBUG_H__ +#define __VINAGRE_DEBUG_H__ + +#include + +/* + * Set an environmental var of the same name to turn on + * debugging output. Setting VINAGRE_DEBUG will turn on all + * sections. + */ +typedef enum { + VINAGRE_NO_DEBUG = 0, + VINAGRE_DEBUG_VIEW = 1 << 0, + VINAGRE_DEBUG_PRINT = 1 << 1, + VINAGRE_DEBUG_PREFS = 1 << 2, + VINAGRE_DEBUG_PLUGINS = 1 << 3, + VINAGRE_DEBUG_UTILS = 1 << 4, + VINAGRE_DEBUG_WINDOW = 1 << 5, + VINAGRE_DEBUG_LOADER = 1 << 6, + VINAGRE_DEBUG_APP = 1 << 7, + VINAGRE_DEBUG_TUBE = 1 << 8 +} VinagreDebugSection; + + +#define DEBUG_VIEW VINAGRE_DEBUG_VIEW, __FILE__, __LINE__, G_STRFUNC +#define DEBUG_PRINT VINAGRE_DEBUG_PRINT, __FILE__, __LINE__, G_STRFUNC +#define DEBUG_PREFS VINAGRE_DEBUG_PREFS, __FILE__, __LINE__, G_STRFUNC +#define DEBUG_PLUGINS VINAGRE_DEBUG_PLUGINS, __FILE__, __LINE__, G_STRFUNC +#define DEBUG_UTILS VINAGRE_DEBUG_UTILS, __FILE__, __LINE__, G_STRFUNC +#define DEBUG_WINDOW VINAGRE_DEBUG_WINDOW, __FILE__, __LINE__, G_STRFUNC +#define DEBUG_LOADER VINAGRE_DEBUG_LOADER, __FILE__, __LINE__, G_STRFUNC +#define DEBUG_APP VINAGRE_DEBUG_APP, __FILE__, __LINE__, G_STRFUNC +#define DEBUG_TUBE VINAGRE_DEBUG_TUBE, __FILE__, __LINE__, G_STRFUNC + +void vinagre_debug_init (void); + +void vinagre_debug (VinagreDebugSection section, + const gchar *file, + gint line, + const gchar *function); + +void vinagre_debug_message (VinagreDebugSection section, + const gchar *file, + gint line, + const gchar *function, + const gchar *format, ...) G_GNUC_PRINTF(5, 6); + + +#endif /* __VINAGRE_DEBUG_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-dirs.c vinagre-2.29.1/vinagre/vinagre-dirs.c --- vinagre-2.26.1/vinagre/vinagre-dirs.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-dirs.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,238 @@ +/* + * vinagre-dirs.c + * This file is part of vinagre + * + * Copyright (C) 2009 Jorge Pereira + * + * vinagre-dirs.c 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. + * + * vinagre-dirs.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include "vinagre-dirs.h" + +gchar * +vinagre_dirs_get_user_config_dir () +{ + gchar *config_dir = NULL; + +#ifndef G_OS_WIN32 + const gchar *home; + + home = g_get_home_dir (); + + if (home != NULL) + { + config_dir = g_build_filename (home, + ".gnome2", + "vinagre", + NULL); + } +#else + config_dir = g_build_filename (g_get_user_config_dir (), + "vinagre", + NULL); +#endif + + return config_dir; +} + +gchar * +vinagre_dirs_get_user_cache_dir () +{ + const gchar *cache_dir; + + cache_dir = g_get_user_cache_dir (); + + return g_build_filename (cache_dir, + "vinagre", + NULL); +} + +gchar * +vinagre_dirs_get_user_plugins_dir (void) +{ + gchar *config_dir; + gchar *plugin_dir; + + config_dir = vinagre_dirs_get_user_config_dir (); + + plugin_dir = g_build_filename (config_dir, + "plugins", + NULL); + g_free (config_dir); + + return plugin_dir; +} + +gchar * +vinagre_dirs_get_user_accels_file () +{ + gchar *accels = NULL; + +#ifndef G_OS_WIN32 + const gchar *home; + + home = g_get_home_dir (); + + if (home != NULL) + { + /* on linux accels are stored in .gnome2/accels + * for historic reasons (backward compat with the + * old libgnome that took care of saving them */ + accels = g_build_filename (home, + ".gnome2", + "accels", + "vinagre", + NULL); + } +#else + { + gchar *config_dir = NULL; + + config_dir = vinagre_dirs_get_user_config_dir (); + accels = g_build_filename (config_dir, + "accels", + "vinagre", + NULL); + + g_free (config_dir); + } +#endif + + return accels; +} + +gchar * +vinagre_dirs_get_vinagre_data_dir (void) +{ + gchar *data_dir; + +#ifndef G_OS_WIN32 + data_dir = g_build_filename (DATADIR, + "vinagre-1", + NULL); +#else + gchar *win32_dir; + + win32_dir = g_win32_get_package_installation_directory_of_module (NULL); + + data_dir = g_build_filename (win32_dir, + "share", + "vinagre-1", + NULL); + + g_free (win32_dir); +#endif + + return data_dir; +} + +gchar * +vinagre_dirs_get_vinagre_locale_dir (void) +{ + gchar *locale_dir; + +#ifndef G_OS_WIN32 + locale_dir = g_build_filename (DATADIR, + "locale", + NULL); +#else + gchar *win32_dir; + + win32_dir = g_win32_get_package_installation_directory_of_module (NULL); + + locale_dir = g_build_filename (win32_dir, + "share", + "locale", + NULL); + + g_free (win32_dir); +#endif + + return locale_dir; +} + +gchar * +vinagre_dirs_get_vinagre_lib_dir (void) +{ + gchar *lib_dir; + +#ifndef G_OS_WIN32 + lib_dir = g_build_filename (LIBDIR, + "vinagre-1", + NULL); +#else + gchar *win32_dir; + + win32_dir = g_win32_get_package_installation_directory_of_module (NULL); + + lib_dir = g_build_filename (win32_dir, + "lib", + "vinagre-1", + NULL); + + g_free (win32_dir); +#endif + + return lib_dir; +} + +gchar * +vinagre_dirs_get_vinagre_plugins_dir (void) +{ + gchar *lib_dir; + gchar *plugin_dir; + + lib_dir = vinagre_dirs_get_vinagre_lib_dir (); + + plugin_dir = g_build_filename (lib_dir, + "plugins", + NULL); + g_free (lib_dir); + + return plugin_dir; +} + +gchar * +vinagre_dirs_get_vinagre_plugin_loaders_dir (void) +{ + gchar *lib_dir; + gchar *loader_dir; + + lib_dir = vinagre_dirs_get_vinagre_lib_dir (); + + loader_dir = g_build_filename (lib_dir, + "plugin-loaders", + NULL); + g_free (lib_dir); + + return loader_dir; +} + +gchar * +vinagre_dirs_get_ui_file (const gchar *file) +{ + gchar *datadir; + gchar *ui_file; + + g_return_val_if_fail (file != NULL, NULL); + + datadir = vinagre_dirs_get_vinagre_data_dir (); + ui_file = g_build_filename (datadir, + "ui", + file, + NULL); + g_free (datadir); + + return ui_file; +} diff -Nru vinagre-2.26.1/vinagre/vinagre-dirs.h vinagre-2.29.1/vinagre/vinagre-dirs.h --- vinagre-2.26.1/vinagre/vinagre-dirs.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-dirs.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,50 @@ +/* + * vinagre-dirs.h + * This file is part of vinagre + * + * Copyright (C) 2009 Jorge Pereira + * + * vinagre-dirs.h 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. + * + * vinagre-dirs.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_DIRS_H__ +#define __VINAGRE_DIRS_H__ + +#include + +G_BEGIN_DECLS + +gchar *vinagre_dirs_get_user_config_dir (void); + +gchar *vinagre_dirs_get_user_cache_dir (void); + +gchar *vinagre_dirs_get_user_plugins_dir (void); + +gchar *vinagre_dirs_get_user_accels_file (void); + +gchar *vinagre_dirs_get_vinagre_data_dir (void); + +gchar *vinagre_dirs_get_vinagre_locale_dir (void); + +gchar *vinagre_dirs_get_vinagre_lib_dir (void); + +gchar *vinagre_dirs_get_vinagre_plugins_dir (void); + +gchar *vinagre_dirs_get_vinagre_plugin_loaders_dir (void); + +gchar *vinagre_dirs_get_ui_file (const gchar *file); + +G_END_DECLS + +#endif /* __VINAGRE_DIRS_H__ */ diff -Nru vinagre-2.26.1/vinagre/vinagre-dnd.h vinagre-2.29.1/vinagre/vinagre-dnd.h --- vinagre-2.26.1/vinagre/vinagre-dnd.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-dnd.h 2009-07-27 15:20:21.000000000 +0100 @@ -0,0 +1,30 @@ +/* + * vinagre-dnd.h + * This file is part of vinagre + * + * Copyright (C) 2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +typedef enum { + TARGET_VINAGRE, + TARGET_STRING +} VinagreDndType; + +static GtkTargetEntry vinagre_target_list[] = { + { "VINAGRE", 0, TARGET_VINAGRE }, + { "text/plain", 0, TARGET_STRING } +}; + diff -Nru vinagre-2.26.1/vinagre/vinagre-fav.c vinagre-2.29.1/vinagre/vinagre-fav.c --- vinagre-2.26.1/vinagre/vinagre-fav.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-fav.c 2009-10-26 12:02:21.000000000 +0000 @@ -0,0 +1,1054 @@ +/* + * vinagre-fav.c + * This file is part of vinagre + * + * Copyright (C) 2007,2008 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include "vinagre-fav.h" +#include "vinagre-utils.h" +#include "vinagre-dnd.h" +#include "vinagre-bookmarks.h" +#include "vinagre-window-private.h" +#include "vinagre-bookmarks-entry.h" +#include "vinagre-plugin.h" +#include "vinagre-plugins-engine.h" + +#ifdef VINAGRE_ENABLE_AVAHI +#include "vinagre-mdns.h" +#endif + +#define VINAGRE_FAV_UI_XML_FILE "vinagre-fav-ui.xml" +#define VINAGRE_FAV_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_FAV, VinagreFavPrivate)) + +struct _VinagreFavPrivate +{ + VinagreWindow *window; + GtkWidget *tree; + GtkTreeModel *model; + GtkActionGroup *action_group, *always_sensitive_action_group; + VinagreBookmarksEntry *selected; + GtkBox *box; +}; + +G_DEFINE_TYPE(VinagreFav, vinagre_fav, GTK_TYPE_FRAME) + +/* Signals */ +enum +{ + FAV_ACTIVATED, + FAV_SELECTED, + LAST_SIGNAL +}; + +/* TreeModel */ +enum { + IMAGE_COL = 0, + NAME_COL, + ENTRY_COL, + IS_FOLDER_COL, + IS_GROUP_COL, + IS_AVAHI_COL, + NUM_COLS +}; + +/* Properties */ +enum +{ + PROP_0, + PROP_WINDOW, +}; + + +static guint signals[LAST_SIGNAL] = { 0 }; + +static void +vinagre_fav_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + VinagreFav *fav = VINAGRE_FAV (object); + + switch (prop_id) + { + case PROP_WINDOW: + fav->priv->window = VINAGRE_WINDOW (g_value_get_object (value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_fav_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + VinagreFav *fav = VINAGRE_FAV (object); + + switch (prop_id) + { + case PROP_WINDOW: + g_value_set_object (value, fav->priv->window); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_fav_row_activated_cb (GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *column, + VinagreFav *fav) +{ + GtkTreeIter iter; + VinagreBookmarksEntry *entry; + gboolean folder, group; + + gtk_tree_model_get_iter (fav->priv->model, &iter, path); + gtk_tree_model_get (fav->priv->model, + &iter, + ENTRY_COL, &entry, + IS_FOLDER_COL, &folder, + IS_GROUP_COL, &group, + -1); + + if (folder || group) + { + if (gtk_tree_view_row_expanded (treeview, path)) + gtk_tree_view_collapse_row (treeview, path); + else + gtk_tree_view_expand_row (treeview, path, FALSE); + return; + } + + vinagre_cmd_open_bookmark (fav->priv->window, + vinagre_bookmarks_entry_get_conn (entry)); + + /* Emits the signal saying that user has activated a bookmark */ + g_signal_emit (G_OBJECT (fav), + signals[FAV_ACTIVATED], + 0, + entry); +} + +static void +vinagre_fav_selection_changed_cb (GtkTreeSelection *selection, + VinagreFav *fav) +{ + GtkTreeIter iter; + VinagreBookmarksEntry *entry = NULL; + gboolean avahi; + + if (gtk_tree_selection_get_selected (selection, NULL, &iter)) + { + gtk_tree_model_get (fav->priv->model, + &iter, + ENTRY_COL, &entry, + IS_AVAHI_COL, &avahi, + -1); + if (avahi) + entry = NULL; + } + + fav->priv->selected = entry; + + gtk_action_group_set_sensitive (fav->priv->action_group, + entry != NULL); + + /* Emits the signal saying that user has selected a bookmark */ + g_signal_emit (G_OBJECT (fav), + signals[FAV_SELECTED], + 0, + entry); +} + +static GtkTreePath * +get_current_path (VinagreFav *fav) +{ + GtkTreePath *path = NULL; + GtkTreeIter iter; + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fav->priv->tree)); + + if (gtk_tree_selection_get_selected (selection, NULL, &iter)) + path = gtk_tree_model_get_path (fav->priv->model, &iter); + + return path; +} + +static void +menu_position (GtkMenu *menu, + gint *x, + gint *y, + gboolean *push_in, + VinagreFav *fav) +{ + GtkTreePath *path; + GdkRectangle rect; + gint wx, wy; + GtkRequisition requisition; + GtkWidget *w; + + w = fav->priv->tree; + path = get_current_path (fav); + + gtk_tree_view_get_cell_area (GTK_TREE_VIEW (w), + path, + NULL, + &rect); + + wx = rect.x; + wy = rect.y; + + gdk_window_get_origin (w->window, x, y); + + gtk_widget_size_request (GTK_WIDGET (menu), &requisition); + + if (gtk_widget_get_direction (w) == GTK_TEXT_DIR_RTL) + *x += w->allocation.x + w->allocation.width - requisition.width - 10; + else + *x += w->allocation.x + 10 ; + + wy = MAX (*y + 5, *y + wy + 5); + wy = MIN (wy, *y + w->allocation.height - requisition.height - 5); + + *y = wy; + + *push_in = TRUE; + + if (path) + gtk_tree_path_free (path); +} + +static gboolean +show_popup_menu (VinagreFav *fav, + GdkEventButton *event, + const gchar *menu_name) +{ + GtkWidget *menu = NULL; + + menu = gtk_ui_manager_get_widget (vinagre_window_get_ui_manager (fav->priv->window), + menu_name); + g_return_val_if_fail (menu != NULL, FALSE); + + if (event) + { + gtk_menu_popup (GTK_MENU (menu), + NULL, + NULL, + NULL, + NULL, + event->button, + event->time); + } + else + { + gtk_menu_popup (GTK_MENU (menu), + NULL, + NULL, + (GtkMenuPositionFunc) menu_position, + fav, + 0, + gtk_get_current_event_time ()); + } + + return TRUE; +} + +static gboolean +fav_button_press_event (GtkTreeView *treeview, + GdkEventButton *event, + VinagreFav *fav) +{ + GtkTreePath *path = NULL; + GtkTreeIter iter; + gboolean folder, group, avahi; + + if (!((GDK_BUTTON_PRESS == event->type) && (3 == event->button))) + return FALSE; + + if (event->window != gtk_tree_view_get_bin_window (treeview)) + return FALSE; + + if (gtk_tree_view_get_path_at_pos (treeview, + event->x, + event->y, + &path, + NULL, + NULL, + NULL)) + { + gtk_tree_model_get_iter (fav->priv->model, &iter, path); + gtk_tree_model_get (fav->priv->model, + &iter, + IS_FOLDER_COL, &folder, + IS_GROUP_COL, &group, + IS_AVAHI_COL, &avahi, + -1); + if (group || avahi) + { + gtk_tree_path_free (path); + return FALSE; + } + + gtk_tree_view_set_cursor (treeview, + path, + NULL, + FALSE); + gtk_tree_path_free (path); + return show_popup_menu (fav, event, folder?"/FavPopupFolder":"/FavPopupConn"); + } + else + return show_popup_menu (fav, event, "/FavPopupEmpty"); + + return FALSE; +} + + +static gboolean +fav_popup_menu (GtkWidget *treeview, + VinagreFav *fav) +{ + /* Only respond if the treeview is the actual focus */ + if (gtk_window_get_focus (GTK_WINDOW (fav->priv->window)) == treeview) + return show_popup_menu (fav, NULL, FALSE); + + return FALSE; +} + +static gboolean +vinagre_fav_tooltip (GtkWidget *widget, + gint x, + gint y, + gboolean k, + GtkTooltip *tooltip, + VinagreFav *fav) +{ + gchar *tip, *name, *uri; + GtkTreePath *path; + gint bx, by; + GtkTreeIter iter; + gboolean folder, group; + VinagreConnection *conn; + VinagreBookmarksEntry *entry; + + gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (widget), + x, y, + &bx, &by); + + if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), + bx, + by, + &path, + NULL, + NULL, + NULL)) + return FALSE; + + gtk_tree_model_get_iter (fav->priv->model, &iter, path); + gtk_tree_model_get (fav->priv->model, + &iter, + ENTRY_COL, &entry, + IS_FOLDER_COL, &folder, + IS_GROUP_COL, &group, + -1); + + gtk_tree_path_free (path); + + if (folder || group) + return FALSE; + + conn = vinagre_bookmarks_entry_get_conn (entry); + name = vinagre_connection_get_best_name (conn); + uri = vinagre_connection_get_string_rep (conn, TRUE); + tip = g_markup_printf_escaped ("%s\n" + "%s %s", + name, + _("Host:"), uri); + + gtk_tooltip_set_markup (tooltip, tip); + g_free (tip); + g_free (name); + g_free (uri); + + return TRUE; +} + +static void +vinagre_fav_cell_set_background (VinagreFav *fav, + GtkCellRenderer *cell, + gboolean is_group, + gboolean is_active) +{ + GdkColor color; + GtkStyle *style; + + g_return_if_fail (fav != NULL); + g_return_if_fail (cell != NULL); + + style = gtk_widget_get_style (GTK_WIDGET (fav)); + + if (!is_group) + { + if (is_active) + { + color = style->bg[GTK_STATE_SELECTED]; + + /* Here we take the current theme colour and add it to + * the colour for white and average the two. This + * gives a colour which is inline with the theme but + * slightly whiter. + */ + color.red = (color.red + (style->white).red) / 2; + color.green = (color.green + (style->white).green) / 2; + color.blue = (color.blue + (style->white).blue) / 2; + + g_object_set (cell, + "cell-background-gdk", &color, + NULL); + + } + else + { + g_object_set (cell, + "cell-background-gdk", NULL, + NULL); + } + } + else + { + color = style->text_aa[GTK_STATE_INSENSITIVE]; + + color.red = (color.red + (style->white).red) / 2; + color.green = (color.green + (style->white).green) / 2; + color.blue = (color.blue + (style->white).blue) / 2; + + g_object_set (cell, + "cell-background-gdk", &color, + NULL); + } +} + +static void +vinagre_fav_pixbuf_cell_data_func (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *model, + GtkTreeIter *iter, + VinagreFav *fav) +{ + GdkPixbuf *pixbuf; + gboolean is_group; + gboolean is_active; + + gtk_tree_model_get (model, iter, + IS_GROUP_COL, &is_group, + IMAGE_COL, &pixbuf, + -1); + + g_object_set (cell, + "visible", !is_group, + "pixbuf", pixbuf, + NULL); + + if (pixbuf != NULL) + g_object_unref (pixbuf); + + is_active = FALSE; + vinagre_fav_cell_set_background (fav, cell, is_group, is_active); +} + +static void +vinagre_fav_title_cell_data_func (GtkTreeViewColumn *column, + GtkCellRenderer *renderer, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + VinagreFav *fav) +{ + char *str; + gboolean is_group; + gboolean is_active; + + gtk_tree_model_get (GTK_TREE_MODEL (fav->priv->model), iter, + NAME_COL, &str, + IS_GROUP_COL, &is_group, + -1); + + g_object_set (renderer, + "text", str, + NULL); + + is_active = FALSE; + vinagre_fav_cell_set_background (fav, renderer, is_group, is_active); + + g_free (str); +} + +static void +vinagre_fav_bookmarks_new_folder (GtkAction *action, + VinagreFav *fav) +{ + vinagre_bookmarks_new_folder (vinagre_bookmarks_get_default (), + GTK_WINDOW (fav->priv->window)); +} + +static void +vinagre_fav_bookmarks_edit (GtkAction *action, + VinagreFav *fav) +{ + vinagre_bookmarks_edit (vinagre_bookmarks_get_default (), + fav->priv->selected, + GTK_WINDOW (fav->priv->window)); +} + +static void +vinagre_fav_bookmarks_del (GtkAction *action, + VinagreFav *fav) +{ + vinagre_bookmarks_del (vinagre_bookmarks_get_default (), + fav->priv->selected, + GTK_WINDOW (fav->priv->window)); +} + +void +vinagre_fav_bookmarks_open (GtkAction *action, + VinagreFav *fav) +{ + VinagreConnection *conn; + + conn = g_object_get_data (G_OBJECT (action), "conn"); + if (!conn) + conn = vinagre_bookmarks_entry_get_conn (fav->priv->selected); + + g_return_if_fail (VINAGRE_IS_CONNECTION (conn)); + + vinagre_cmd_open_bookmark (fav->priv->window, conn); +} + +static const GtkActionEntry always_sensitive_actions[] = +{ + {"BookmarksNewFolder", "folder-new", N_("_New Folder"), NULL, + N_("Create a new folder"), G_CALLBACK (vinagre_fav_bookmarks_new_folder) }, +}; + +static const GtkActionEntry actions[] = +{ + { "BookmarksOpen", GTK_STOCK_CONNECT, N_("_Open bookmark"), NULL, + N_("Connect to this machine"), G_CALLBACK (vinagre_fav_bookmarks_open) }, + {"BookmarksEdit", GTK_STOCK_EDIT, N_("_Edit bookmark"), NULL, + N_("Edit the details of selected bookmark"), G_CALLBACK (vinagre_fav_bookmarks_edit) }, + {"BookmarksDel", GTK_STOCK_DELETE, N_("_Remove from bookmarks"), NULL, + N_("Remove current selected connection from bookmarks"), G_CALLBACK (vinagre_fav_bookmarks_del) }, +}; + +static void +vinagre_fav_create_toolbar (VinagreFav *fav) +{ + GtkWidget *toolbar; + GtkActionGroup *action_group; + GtkAction *action; + GtkUIManager *manager; + GError *error = NULL; + + manager = fav->priv->window->priv->manager; + gtk_ui_manager_add_ui_from_file (manager, + vinagre_fav_get_ui_xml_filename (), + &error); + if (error != NULL) + { + g_critical (_("Could not merge UI XML file: %s"), error->message); + g_error_free (error); + return; + } + + action_group = gtk_action_group_new ("BookmarksActionGroup"); + gtk_action_group_set_translation_domain (action_group, NULL); + gtk_action_group_add_actions (action_group, + actions, + G_N_ELEMENTS (actions), + fav); + gtk_ui_manager_insert_action_group (manager, action_group, 0); + gtk_action_group_set_sensitive (action_group, FALSE); + fav->priv->action_group = action_group; + + action_group = gtk_action_group_new ("BookmarksAlwaysSensitiveActionGroup"); + gtk_action_group_set_translation_domain (action_group, NULL); + gtk_action_group_add_actions (action_group, + always_sensitive_actions, + G_N_ELEMENTS (always_sensitive_actions), + fav); + gtk_ui_manager_insert_action_group (manager, action_group, 0); + fav->priv->always_sensitive_action_group = action_group; + + toolbar = gtk_ui_manager_get_widget (manager, "/FavToolBar"); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS); + gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU); + + gtk_widget_show (toolbar); + gtk_box_pack_start (fav->priv->box, toolbar, FALSE, FALSE, 0); +} + +static void +vinagre_fav_create_tree (VinagreFav *fav) +{ + GtkCellRenderer *cell; + GtkWidget *scroll; + GtkTreeSelection *selection; + GtkTreeViewColumn *main_column; + + /* Create the scrolled window */ + scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), + GTK_SHADOW_ETCHED_OUT); + + gtk_box_pack_start (fav->priv->box, scroll, TRUE, TRUE, 0); + + /* Create the model */ + fav->priv->model = GTK_TREE_MODEL (gtk_tree_store_new (NUM_COLS, + GDK_TYPE_PIXBUF, + G_TYPE_STRING, + VINAGRE_TYPE_BOOKMARKS_ENTRY, + G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN)); + + fav->priv->tree = gtk_tree_view_new_with_model (fav->priv->model); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (fav->priv->tree), FALSE); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fav->priv->tree)); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); + g_signal_connect (selection, "changed", G_CALLBACK (vinagre_fav_selection_changed_cb), fav); + + main_column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_clickable (main_column, FALSE); + gtk_tree_view_append_column (GTK_TREE_VIEW (fav->priv->tree), main_column); + + /* Set up the pixbuf column */ + cell = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (main_column, cell, FALSE); + gtk_tree_view_column_set_cell_data_func (main_column, + cell, + (GtkTreeCellDataFunc) vinagre_fav_pixbuf_cell_data_func, + fav, + NULL); + + /* Set up the name column */ + cell = gtk_cell_renderer_text_new (); + g_object_set (cell, + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); + gtk_tree_view_column_pack_start (main_column, cell, TRUE); + gtk_tree_view_column_set_cell_data_func (main_column, + cell, + (GtkTreeCellDataFunc) vinagre_fav_title_cell_data_func, + fav, + NULL); + + g_signal_connect (fav->priv->tree, + "row-activated", + G_CALLBACK (vinagre_fav_row_activated_cb), + fav); + + g_signal_connect (fav->priv->tree, + "button-press-event", + G_CALLBACK (fav_button_press_event), + fav); + + g_signal_connect (fav->priv->tree, + "popup-menu", + G_CALLBACK (fav_popup_menu), + fav); + + gtk_widget_set_has_tooltip (fav->priv->tree, TRUE); + g_signal_connect (fav->priv->tree, + "query-tooltip", + G_CALLBACK (vinagre_fav_tooltip), + fav); + + g_idle_add ((GSourceFunc)vinagre_fav_update_list, fav); + + gtk_container_add (GTK_CONTAINER(scroll), fav->priv->tree); + + gtk_widget_show (fav->priv->tree); + g_object_unref (G_OBJECT (fav->priv->model)); +} + +static void +drag_data_received_handl (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint target_type, + guint time, + VinagreFav *fav) +{ + gchar *_sdata; + gboolean success = FALSE; + + if ((selection_data != NULL) && (selection_data->length >= 0)) + { + switch (target_type) + { + case TARGET_VINAGRE: + _sdata = (gchar*)selection_data-> data; + success = TRUE; + break; + + default: + g_print ("nothing good"); + } + } + + gtk_drag_finish (context, success, FALSE, time); + + if (success) + { + VinagreConnection *conn; + gchar **info; + gchar *error = NULL; + + info = g_strsplit (_sdata, "||", 2); + if (g_strv_length (info) != 2) + { + vinagre_utils_show_error (_("Invalid operation"), + _("Data received from drag&drop operation is invalid."), + GTK_WINDOW (fav->priv->window)); + return; + } + + conn = vinagre_connection_new_from_string (info[1], &error, FALSE); + if (!conn) + { + g_strfreev (info); + vinagre_utils_show_error (NULL, + error ? error : _("Unknown error"), + GTK_WINDOW (fav->priv->window)); + g_free (error); + return; + } + + vinagre_connection_set_name (conn, info[0]); + vinagre_bookmarks_add (vinagre_bookmarks_get_default (), + conn, + GTK_WINDOW (fav->priv->window)); + + g_strfreev (info); + g_object_unref (conn); + } +} + +static gboolean +drag_drop_handl (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + gpointer user_data) +{ + gboolean is_valid_drop_site; + GdkAtom target_type; + + is_valid_drop_site = FALSE; + + if (context->targets) + { + target_type = GDK_POINTER_TO_ATOM (g_list_nth_data (context->targets, TARGET_VINAGRE)); + gtk_drag_get_data (widget, + context, + target_type, + time); + is_valid_drop_site = TRUE; + } + + return is_valid_drop_site; +} + +static void +vinagre_fav_init (VinagreFav *fav) +{ + fav->priv = VINAGRE_FAV_GET_PRIVATE (fav); + fav->priv->selected = NULL; + + gtk_frame_set_shadow_type (GTK_FRAME (fav), GTK_SHADOW_ETCHED_IN); + fav->priv->box = GTK_BOX (gtk_vbox_new (FALSE, 0)); + gtk_container_add (GTK_CONTAINER (fav), GTK_WIDGET (fav->priv->box)); +} + +GtkWidget * +vinagre_fav_new (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return GTK_WIDGET (g_object_new (VINAGRE_TYPE_FAV, + "window", window, + NULL)); +} + +static void +vinagre_fav_hide (GtkButton *button, VinagreFav *fav) +{ + GtkAction *action; + + action = gtk_action_group_get_action (fav->priv->window->priv->always_sensitive_action_group, + "ViewSidePanel"); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE); +} + +static void +vinagre_fav_create_title (VinagreFav *fav) +{ + GtkWidget *box, *label, *close_button, *image, *frame; + + box = gtk_hbox_new (FALSE, 0); + + /* setup image */ + image = gtk_image_new_from_icon_name ("user-bookmarks", GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_misc_set_alignment (GTK_MISC (image), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0); + + /* setup label */ + label = gtk_label_new (_("Bookmarks")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_misc_set_padding (GTK_MISC (label), 6, 0); + gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); + + /* setup small close button */ + close_button = vinagre_utils_create_small_close_button (); + gtk_box_pack_start (GTK_BOX (box), close_button, FALSE, FALSE, 0); + gtk_widget_set_tooltip_text (close_button, _("Hide panel")); + g_signal_connect (close_button, + "clicked", + G_CALLBACK (vinagre_fav_hide), + fav); + + gtk_box_pack_start (fav->priv->box, box, FALSE, FALSE, 0); + gtk_widget_show_all (box); +} + +static void +vinagre_fav_constructed (GObject *object) +{ + VinagreFav *fav = VINAGRE_FAV (object); + + if (G_OBJECT_CLASS (vinagre_fav_parent_class)->constructed) + G_OBJECT_CLASS (vinagre_fav_parent_class)->constructed (object); + + vinagre_fav_create_title (fav); + vinagre_fav_create_toolbar (fav); + vinagre_fav_create_tree (fav); + + gtk_drag_dest_set (fav->priv->tree, + GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT, + vinagre_target_list, + G_N_ELEMENTS (vinagre_target_list), + GDK_ACTION_COPY); + + g_signal_connect (fav->priv->tree, + "drag-data-received", + G_CALLBACK(drag_data_received_handl), + fav); + g_signal_connect (fav->priv->tree, + "drag-drop", + G_CALLBACK (drag_drop_handl), + NULL); + + g_signal_connect_swapped (vinagre_bookmarks_get_default (), + "changed", + G_CALLBACK (vinagre_fav_update_list), + fav); +#ifdef VINAGRE_ENABLE_AVAHI + g_signal_connect_swapped (vinagre_mdns_get_default (), + "changed", + G_CALLBACK (vinagre_fav_update_list), + fav); +#endif +} + +static void +vinagre_fav_class_init (VinagreFavClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->get_property = vinagre_fav_get_property; + object_class->set_property = vinagre_fav_set_property; + object_class->constructed = vinagre_fav_constructed; + + g_object_class_install_property (object_class, + PROP_WINDOW, + g_param_spec_object ("window", + "Window", + "The VinagreWindow this panel is associated with", + VINAGRE_TYPE_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + + signals[FAV_ACTIVATED] = + g_signal_new ("fav-activated", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (VinagreFavClass, fav_activated), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, + G_TYPE_OBJECT); + + signals[FAV_SELECTED] = + g_signal_new ("fav-selected", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (VinagreFavClass, fav_selected), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, + G_TYPE_OBJECT); + + g_type_class_add_private (object_class, sizeof (VinagreFavPrivate)); +} + +static void +vinagre_fav_fill_bookmarks (GtkTreeStore *store, GSList *list, GtkTreeIter *parent_iter, gboolean is_avahi) +{ + GdkPixbuf *pixbuf; + GtkIconTheme *icon_theme; + gchar *name; + VinagreBookmarksEntry *entry; + GSList *l; + GtkTreeIter iter; + VinagreConnection *conn; + VinagrePlugin *plugin; + + for (l = list; l; l = l->next) + { + entry = (VinagreBookmarksEntry *) l->data; + switch (vinagre_bookmarks_entry_get_node (entry)) + { + case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: + icon_theme = gtk_icon_theme_get_default (); + pixbuf = gtk_icon_theme_load_icon (icon_theme, + "folder", + 16, + 0, + NULL); + + gtk_tree_store_append (store, &iter, parent_iter); + gtk_tree_store_set (store, &iter, + IMAGE_COL, pixbuf, + NAME_COL, vinagre_bookmarks_entry_get_name (entry), + ENTRY_COL, entry, + IS_FOLDER_COL, TRUE, + IS_GROUP_COL, FALSE, + IS_AVAHI_COL, FALSE, + -1); + if (pixbuf != NULL) + g_object_unref (pixbuf); + + vinagre_fav_fill_bookmarks (store, vinagre_bookmarks_entry_get_children (entry), &iter, is_avahi); + break; + + case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: + conn = vinagre_bookmarks_entry_get_conn (entry); + name = vinagre_connection_get_best_name (conn); + plugin = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), + vinagre_connection_get_protocol (conn)); + + pixbuf = vinagre_plugin_get_icon (plugin, 16); + + gtk_tree_store_append (store, &iter, parent_iter); + gtk_tree_store_set (store, &iter, + IMAGE_COL, pixbuf, + NAME_COL, name, + ENTRY_COL, entry, + IS_FOLDER_COL, FALSE, + IS_GROUP_COL, FALSE, + IS_AVAHI_COL, is_avahi, + -1); + g_free (name); + if (pixbuf != NULL) + g_object_unref (pixbuf); + break; + + default: + g_assert_not_reached (); + } + } +} + +gboolean +vinagre_fav_update_list (VinagreFav *fav) +{ + GtkTreeIter iter, parent_iter; + GtkTreeStore *store; + GSList *list, *l, *next; + GdkPixbuf *pixbuf; + + g_return_val_if_fail (VINAGRE_IS_FAV (fav), FALSE); + + store = GTK_TREE_STORE (fav->priv->model); + gtk_tree_store_clear (store); + + /* bookmarks */ + list = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()); + + vinagre_fav_fill_bookmarks (store, list, NULL, FALSE); + +#ifdef VINAGRE_ENABLE_AVAHI + list = vinagre_mdns_get_all (vinagre_mdns_get_default ()); + if (!list) + return FALSE; + + gtk_tree_store_append (store, &parent_iter, NULL); + gtk_tree_store_set (store, &parent_iter, + NAME_COL, _("Hosts nearby"), + IS_GROUP_COL, TRUE, + IS_FOLDER_COL, FALSE, + IS_AVAHI_COL, FALSE, + -1); + + vinagre_fav_fill_bookmarks (store, list, NULL, TRUE); +#endif + + return FALSE; +} + +const gchar * +vinagre_fav_get_ui_xml_filename (void) +{ + if (g_file_test (VINAGRE_FAV_UI_XML_FILE, G_FILE_TEST_EXISTS)) + return VINAGRE_FAV_UI_XML_FILE; + else + return VINAGRE_DATADIR "/" VINAGRE_FAV_UI_XML_FILE; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-fav.h vinagre-2.29.1/vinagre/vinagre-fav.h --- vinagre-2.26.1/vinagre/vinagre-fav.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-fav.h 2009-10-26 11:49:47.000000000 +0000 @@ -0,0 +1,72 @@ +/* + * vinagre-fav.h + * This file is part of vinagre + * + * Copyright (C) 2007,2008 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_FAV_H__ +#define __VINAGRE_FAV_H__ + +#include +#include "vinagre-bookmarks-entry.h" +#include "vinagre-window.h" + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_FAV (vinagre_fav_get_type()) +#define VINAGRE_FAV(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_FAV, VinagreFav)) +#define VINAGRE_FAV_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_FAV, VinagreFav const)) +#define VINAGRE_FAV_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_FAV, VinagreFavClass)) +#define VINAGRE_IS_FAV(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_FAV)) +#define VINAGRE_IS_FAV_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_FAV)) +#define VINAGRE_FAV_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_FAV, VinagreFavClass)) + +typedef struct _VinagreFavPrivate VinagreFavPrivate; +typedef struct _VinagreFav VinagreFav; +typedef struct _VinagreFavClass VinagreFavClass; + +struct _VinagreFav +{ + GtkFrame frame; + VinagreFavPrivate *priv; +}; + +struct _VinagreFavClass +{ + GtkFrameClass parent_class; + + /* Signals */ + void (* fav_activated) (VinagreFav *fav, + VinagreBookmarksEntry *entry); + + void (* fav_selected) (VinagreFav *fav, + VinagreBookmarksEntry *entry); +}; + +GType vinagre_fav_get_type (void) G_GNUC_CONST; + +GtkWidget *vinagre_fav_new (VinagreWindow *window); + +gboolean vinagre_fav_update_list (VinagreFav *fav); + +void vinagre_fav_bookmarks_open (GtkAction *action, VinagreFav *fav); + +const gchar * vinagre_fav_get_ui_xml_filename (void); + +G_END_DECLS + +#endif /* __VINAGRE_FAV_H__ */ diff -Nru vinagre-2.26.1/vinagre/vinagre-main.c vinagre-2.29.1/vinagre/vinagre-main.c --- vinagre-2.26.1/vinagre/vinagre-main.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-main.c 2009-08-11 19:56:07.000000000 +0100 @@ -0,0 +1,236 @@ +/* + * vinagre-main.c + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include "vinagre-connection.h" +#include "vinagre-commands.h" +#include "vinagre-bookmarks.h" +#include "vinagre-window.h" +#include "vinagre-app.h" +#include "vinagre-utils.h" +#include "vinagre-prefs.h" +#include "vinagre-bacon.h" +#include "vinagre-plugins-engine.h" +#include "vinagre-plugin-info.h" +#include "vinagre-plugin-info-priv.h" +#include "vinagre-debug.h" + +#ifdef HAVE_TELEPATHY +#include "vinagre-tubes-manager.h" +#endif + +#ifdef VINAGRE_ENABLE_AVAHI +#include "vinagre-mdns.h" +#endif + +/* command line */ +static gchar **files = NULL; +static gchar **remaining_args = NULL; +static GSList *servers = NULL; +static gboolean new_window = FALSE; +static gboolean fullscreen = FALSE; + +static const GOptionEntry options [] = +{ + { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscreen, + /* Translators: this is a command line option (run vinagre --help) */ + N_("Open vinagre in fullscreen mode"), NULL }, + + { "new-window", 'n', 0, G_OPTION_ARG_NONE, &new_window, + /* Translators: this is a command line option (run vinagre --help) */ + N_("Create a new toplevel window in an existing instance of vinagre"), NULL }, + + { "file", 'F', 0, G_OPTION_ARG_FILENAME_ARRAY, &files, + /* Translators: this is a command line option (run vinagre --help) */ + N_("Open a file recognized by vinagre"), N_("filename")}, + + { + G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &remaining_args, + /* Translators: this is a command line option (run vinagre --help) */ + NULL, N_("[server:port]") }, + + { NULL } +}; + +static void +vinagre_main_process_command_line (VinagreWindow *window) +{ + gint i; + VinagreConnection *conn; + gchar *error; + GSList *errors = NULL; + + if (files) + { + for (i = 0; files[i]; i++) + { + conn = vinagre_connection_new_from_file (files[i], &error, FALSE); + if (conn) + servers = g_slist_prepend (servers, conn); + else + { + errors = g_slist_prepend (errors, + g_strdup_printf ("%s: %s", + files[i], + error ? error : _("Unknown error"))); + if (error) + g_free (error); + } + } + g_strfreev (files); + } + + if (remaining_args) + { + for (i = 0; remaining_args[i]; i++) + { + conn = vinagre_connection_new_from_string (remaining_args[i], &error, TRUE); + if (conn) + servers = g_slist_prepend (servers, conn); + else + errors = g_slist_prepend (errors, + g_strdup_printf ("%s: %s", + remaining_args[i], + error ? error : _("Unknown error"))); + + if (error) + g_free (error); + } + + g_strfreev (remaining_args); + } + + if (errors) + { + vinagre_utils_show_many_errors (ngettext ("The following error has occurred:", + "The following errors have occurred:", + g_slist_length (errors)), + errors, + window?GTK_WINDOW (window):NULL); + g_slist_free (errors); + } +} + +int main (int argc, char **argv) { + GOptionContext *context; + GError *error = NULL; + GSList *l, *plugins; + VinagreWindow *window; + VinagreApp *app; + VinagrePluginsEngine *engine; +#ifdef HAVE_TELEPATHY + VinagreTubesManager *vinagre_tubes_manager; +#endif + + if (!g_thread_supported ()) + g_thread_init (NULL); + g_type_init(); + + /* Setup debugging */ + vinagre_debug_init (); + vinagre_debug_message (DEBUG_APP, "Startup"); + + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + + /* Init plugins engine */ + vinagre_debug_message (DEBUG_APP, "Init plugins"); + engine = vinagre_plugins_engine_get_default (); + plugins = (GSList *) vinagre_plugins_engine_get_plugin_list (engine); + + /* Setup command line options */ + context = g_option_context_new (_("- Remote Desktop Viewer")); + g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + + for (l = plugins; l; l = l->next) + { + GOptionGroup *group; + GSList *groups, *l2; + VinagrePluginInfo *info = VINAGRE_PLUGIN_INFO (l->data); + + if (!vinagre_plugin_info_is_active (info)) + continue; + + groups = vinagre_plugin_get_context_groups (info->plugin); + for (l2 = groups; l2; l2 = l2->next) + g_option_context_add_group (context, (GOptionGroup *)l2->data); + g_slist_free (groups); + } + + g_option_context_parse (context, &argc, &argv, &error); + if (error) + { + g_print ("%s\n%s\n", + error->message, + _("Run 'vinagre --help' to see a full list of available command line options")); + g_error_free (error); + return 1; + } + + g_set_application_name (_("Remote Desktop Viewer")); + vinagre_main_process_command_line (NULL); + + vinagre_bacon_start (servers, new_window); + + app = vinagre_app_get_default (); + window = vinagre_app_create_window (app, NULL); + gtk_widget_show (GTK_WIDGET(window)); + + vinagre_utils_handle_debug (); + + for (l = servers; l; l = l->next) + { + VinagreConnection *conn = l->data; + + vinagre_connection_set_fullscreen (conn, fullscreen); + vinagre_cmd_direct_connect (conn, window); + g_object_unref (conn); + } + g_slist_free (servers); + +#ifdef HAVE_TELEPATHY + vinagre_tubes_manager = vinagre_tubes_manager_new (window); +#endif + + gtk_main (); + +#ifdef HAVE_TELEPATHY + g_object_unref (vinagre_tubes_manager); +#endif + g_object_unref (vinagre_bookmarks_get_default ()); + g_object_unref (vinagre_prefs_get_default ()); +#ifdef VINAGRE_ENABLE_AVAHI + g_object_unref (vinagre_mdns_get_default ()); +#endif + + return 0; +} +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-mdns.c vinagre-2.29.1/vinagre/vinagre-mdns.c --- vinagre-2.26.1/vinagre/vinagre-mdns.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-mdns.c 2009-09-06 13:39:32.000000000 +0100 @@ -0,0 +1,389 @@ +/* + * vinagre-mdns.c + * This file is part of vinagre + * + * Copyright (C) Jonh Wendell 2008 + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include + +#include "vinagre-mdns.h" +#include "vinagre-connection.h" +#include "vinagre-bookmarks-entry.h" +#include "vinagre-plugins-engine.h" +#include "vinagre-plugin.h" +#include "vinagre-plugin-info.h" +#include "vinagre-plugin-info-priv.h" + +typedef struct +{ + GaServiceBrowser *browser; + VinagrePluginInfo *info; +} BrowserEntry; + +struct _VinagreMdnsPrivate +{ + GSList *entries; + GaClient *client; + GHashTable *browsers; +}; + +enum +{ + MDNS_CHANGED, + LAST_SIGNAL +}; + +G_DEFINE_TYPE (VinagreMdns, vinagre_mdns, G_TYPE_OBJECT); + +static VinagreMdns *mdns_singleton = NULL; +static guint signals[LAST_SIGNAL] = { 0 }; + +static void +mdns_resolver_found (GaServiceResolver *resolver, + AvahiIfIndex iface, + GaProtocol proto, + gchar *name, + gchar *type, + gchar *domain, + gchar *host_name, + AvahiAddress *address, + gint port, + AvahiStringList *txt, + GaLookupResultFlags flags, + VinagreMdns *mdns) +{ + VinagreConnection *conn; + VinagreBookmarksEntry *entry; + BrowserEntry *b_entry; + char a[AVAHI_ADDRESS_STR_MAX]; + + b_entry = g_hash_table_lookup (mdns->priv->browsers, type); + if (!b_entry) + { + g_error ("Service name not found in mDNS resolver hash table. This probably is a bug somewhere."); + return; + } + + avahi_address_snprint (a, sizeof(a), address); + conn = vinagre_plugin_new_connection (b_entry->info->plugin); + g_object_set (conn, + "name", name, + "port", port, + "host", a, + NULL); + entry = vinagre_bookmarks_entry_new_conn (conn); + g_object_unref (conn); + + mdns->priv->entries = g_slist_insert_sorted (mdns->priv->entries, + entry, + (GCompareFunc)vinagre_bookmarks_entry_compare); + + g_object_unref (resolver); + g_signal_emit (mdns, signals[MDNS_CHANGED], 0); +} + +static void +mdns_resolver_failure (GaServiceResolver *resolver, + GError *error, + VinagreMdns *mdns) +{ + g_warning ("%s", error->message); + g_object_unref (resolver); +} + +static void +mdns_browser_new_cb (GaServiceBrowser *browser, + AvahiIfIndex iface, + GaProtocol proto, + gchar *name, + gchar *type, + gchar *domain, + GaLookupResultFlags flags, + VinagreMdns *mdns) +{ + GaServiceResolver *resolver; + GError *error = NULL; + + resolver = ga_service_resolver_new (iface, + proto, + name, + type, + domain, + GA_PROTOCOL_UNSPEC, + GA_LOOKUP_NO_FLAGS); + + g_signal_connect (resolver, + "found", + G_CALLBACK (mdns_resolver_found), + mdns); + g_signal_connect (resolver, + "failure", + G_CALLBACK (mdns_resolver_failure), + mdns); + + if (!ga_service_resolver_attach (resolver, + mdns->priv->client, + &error)) + { + g_warning (_("Failed to resolve avahi hostname: %s\n"), error->message); + g_error_free (error); + } +} + +static void +mdns_browser_del_cb (GaServiceBrowser *browser, + AvahiIfIndex iface, + GaProtocol proto, + gchar *name, + gchar *type, + gchar *domain, + GaLookupResultFlags flags, + VinagreMdns *mdns) +{ + GSList *l; + + for (l = mdns->priv->entries; l; l = l->next) + { + VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (l->data); + if (strcmp (vinagre_connection_get_name (vinagre_bookmarks_entry_get_conn (entry)), name) == 0) + { + mdns->priv->entries = g_slist_remove (mdns->priv->entries, entry); + g_object_unref (entry); + g_signal_emit (mdns, signals[MDNS_CHANGED], 0); + return; + } + } +} + +static void +destroy_browser_entry (BrowserEntry *entry) +{ + g_object_unref (entry->browser); + _vinagre_plugin_info_unref (entry->info); + g_free (entry); +} + +static void +vinagre_mdns_add_service (VinagrePluginInfo *info, + VinagreMdns *mdns) +{ + GaServiceBrowser *browser; + GError *error = NULL; + const gchar *service; + BrowserEntry *entry; + VinagrePlugin *plugin; + + if (!vinagre_plugin_info_is_active (info)) + return; + + service = vinagre_plugin_get_mdns_service (info->plugin); + if (!service) + return; + + entry = g_hash_table_lookup (mdns->priv->browsers, service); + if (entry) + { + g_warning (_("Plugin %s has already registered a browser for service %s."), + info->name, + service); + return; + } + + browser = ga_service_browser_new ((gchar *)service); + if (!browser) + { + g_warning (_("Failed to add mDNS browser for service %s."), service); + return; + } + g_signal_connect (browser, + "new-service", + G_CALLBACK (mdns_browser_new_cb), + mdns); + g_signal_connect (browser, + "removed-service", + G_CALLBACK (mdns_browser_del_cb), + mdns); + + if (!ga_service_browser_attach (browser, + mdns->priv->client, + &error)) + { + g_warning (_("Failed to browse for hosts: %s\n"), error->message); + g_error_free (error); + return; + } + + entry = g_new (BrowserEntry, 1); + entry->browser = g_object_ref (browser); + _vinagre_plugin_info_ref (info); + entry->info = info; + g_hash_table_insert (mdns->priv->browsers, (gpointer)service, entry); +} + +static void +vinagre_mdns_remove_entries_by_protocol (VinagreMdns *mdns, const gchar *protocol) +{ + GSList *l; + gboolean changed = FALSE; + + for (l = mdns->priv->entries; l; l = l->next) + { + VinagreBookmarksEntry *entry = VINAGRE_BOOKMARKS_ENTRY (l->data); + if (strcmp (vinagre_connection_get_protocol (vinagre_bookmarks_entry_get_conn (entry)), protocol) == 0) + { + mdns->priv->entries = g_slist_remove (mdns->priv->entries, entry); + g_object_unref (entry); + changed = TRUE; + } + } + + if (changed) + g_signal_emit (mdns, signals[MDNS_CHANGED], 0); +} + +static void +plugin_activated_cb (VinagrePluginsEngine *engine, + VinagrePluginInfo *info, + VinagreMdns *mdns) +{ + vinagre_mdns_add_service (info, mdns); +} + +static void +plugin_deactivated_cb (VinagrePluginsEngine *engine, + VinagrePluginInfo *info, + VinagreMdns *mdns) +{ + const gchar *service; + + service = vinagre_plugin_get_mdns_service (info->plugin); + if (!service) + return; + + vinagre_mdns_remove_entries_by_protocol (mdns, + vinagre_plugin_get_protocol (info->plugin)); + g_hash_table_remove (mdns->priv->browsers, (gconstpointer)service); + +} + +static void +vinagre_mdns_init (VinagreMdns *mdns) +{ + GError *error = NULL; + GSList *plugins; + VinagrePluginsEngine *engine; + + mdns->priv = G_TYPE_INSTANCE_GET_PRIVATE (mdns, VINAGRE_TYPE_MDNS, VinagreMdnsPrivate); + + mdns->priv->entries = NULL; + mdns->priv->browsers = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify)destroy_browser_entry); + mdns->priv->client = ga_client_new (GA_CLIENT_FLAG_NO_FLAGS); + + if (!ga_client_start (mdns->priv->client, &error)) + { + g_warning (_("Failed to initialize mDNS browser: %s\n"), error->message); + g_error_free (error); + g_object_unref (mdns->priv->client); + mdns->priv->client = NULL; + return; + } + + engine = vinagre_plugins_engine_get_default (); + plugins = (GSList *)vinagre_plugins_engine_get_plugin_list (engine); + g_slist_foreach (plugins, + (GFunc)vinagre_mdns_add_service, + mdns); + + g_signal_connect_after (engine, + "activate-plugin", + G_CALLBACK (plugin_activated_cb), + mdns); + g_signal_connect (engine, + "deactivate-plugin", + G_CALLBACK (plugin_deactivated_cb), + mdns); +} + +static void +vinagre_mdns_dispose (GObject *object) +{ + VinagreMdns *mdns = VINAGRE_MDNS (object); + + if (mdns->priv->browsers) + { + g_hash_table_unref (mdns->priv->browsers); + mdns->priv->browsers = NULL; + } + + if (mdns->priv->client) + { + g_object_unref (mdns->priv->client); + mdns->priv->client = NULL; + } + + if (mdns->priv->entries) + { + g_slist_foreach (mdns->priv->entries, (GFunc) g_object_unref, NULL); + g_slist_free (mdns->priv->entries); + mdns->priv->entries = NULL; + } + + G_OBJECT_CLASS (vinagre_mdns_parent_class)->dispose (object); +} + +static void +vinagre_mdns_class_init (VinagreMdnsClass *klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS (klass); + GObjectClass* parent_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (VinagreMdnsPrivate)); + + object_class->dispose = vinagre_mdns_dispose; + + signals[MDNS_CHANGED] = + g_signal_new ("changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (VinagreMdnsClass, changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + +} + +VinagreMdns * +vinagre_mdns_get_default (void) +{ + if (G_UNLIKELY (!mdns_singleton)) + mdns_singleton = VINAGRE_MDNS (g_object_new (VINAGRE_TYPE_MDNS, + NULL)); + return mdns_singleton; +} + +GSList * +vinagre_mdns_get_all (VinagreMdns *mdns) +{ + g_return_val_if_fail (VINAGRE_IS_MDNS (mdns), NULL); + + return mdns->priv->entries; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-mdns.h vinagre-2.29.1/vinagre/vinagre-mdns.h --- vinagre-2.26.1/vinagre/vinagre-mdns.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-mdns.h 2009-07-27 12:59:30.000000000 +0100 @@ -0,0 +1,62 @@ +/* + * vinagre-mdns.h + * This file is part of vinagre + * + * Copyright (C) Jonh Wendell 2008,2009 + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef _VINAGRE_MDNS_H_ +#define _VINAGRE_MDNS_H_ + +#include +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_MDNS (vinagre_mdns_get_type ()) +#define VINAGRE_MDNS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_MDNS, VinagreMdns)) +#define VINAGRE_MDNS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_MDNS, VinagreMdnsClass)) +#define VINAGRE_IS_MDNS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_MDNS)) +#define VINAGRE_IS_MDNS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_MDNS)) +#define VINAGRE_MDNS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_MDNS, VinagreMdnsClass)) + +typedef struct _VinagreMdnsClass VinagreMdnsClass; +typedef struct _VinagreMdns VinagreMdns; +typedef struct _VinagreMdnsPrivate VinagreMdnsPrivate; + +struct _VinagreMdnsClass +{ + GObjectClass parent_class; + + /* Signals */ + void (* changed) (VinagreMdns *mdns); +}; + +struct _VinagreMdns +{ + GObject parent_instance; + VinagreMdnsPrivate *priv; +}; + +GType vinagre_mdns_get_type (void) G_GNUC_CONST; + +VinagreMdns *vinagre_mdns_get_default (void); +GSList *vinagre_mdns_get_all (VinagreMdns *mdns); + +G_END_DECLS + +#endif /* _VINAGRE_MDNS_H_ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-notebook.c vinagre-2.29.1/vinagre/vinagre-notebook.c --- vinagre-2.26.1/vinagre/vinagre-notebook.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-notebook.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,753 @@ +/* + * vinagre-notebook.c + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#include "vinagre-notebook.h" +#include "vinagre-utils.h" +#include "vinagre-dnd.h" +#include "vinagre-prefs.h" +#include "vinagre-spinner.h" + +#define VINAGRE_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookPrivate)) + +struct _VinagreNotebookPrivate +{ + VinagreWindow *window; + GtkUIManager *manager; + guint ui_merge_id; + VinagreTab *active_tab; + GSList *tabs; +}; + +/* Properties */ +enum +{ + PROP_0, + PROP_WINDOW +}; + +G_DEFINE_TYPE(VinagreNotebook, vinagre_notebook, GTK_TYPE_NOTEBOOK) + +static void +vinagre_notebook_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + VinagreNotebook *nb = VINAGRE_NOTEBOOK (object); + + switch (prop_id) + { + case PROP_WINDOW: + g_value_set_object (value, nb->priv->window); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_notebook_set_window (VinagreNotebook *nb, VinagreWindow *window) +{ + nb->priv->window = window; + nb->priv->manager = vinagre_window_get_ui_manager (window); + nb->priv->ui_merge_id = gtk_ui_manager_new_merge_id (nb->priv->manager); +} + +static void +vinagre_notebook_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + VinagreNotebook *nb = VINAGRE_NOTEBOOK (object); + + switch (prop_id) + { + case PROP_WINDOW: + vinagre_notebook_set_window (nb, VINAGRE_WINDOW (g_value_get_object (value))); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_notebook_finalize (GObject *object) +{ + VinagreNotebook *nb = VINAGRE_NOTEBOOK (object); + + if (nb->priv->tabs) + { + g_slist_free (nb->priv->tabs); + nb->priv->tabs = NULL; + } + + G_OBJECT_CLASS (vinagre_notebook_parent_class)->finalize (object); +} + +static void +vinagre_notebook_class_init (VinagreNotebookClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->get_property = vinagre_notebook_get_property; + object_class->set_property = vinagre_notebook_set_property; + object_class->finalize = vinagre_notebook_finalize; + + g_object_class_install_property (object_class, + PROP_WINDOW, + g_param_spec_object ("window", + "Window", + "The VinagreWindow", + VINAGRE_TYPE_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_type_class_add_private (object_class, sizeof(VinagreNotebookPrivate)); +} + +VinagreNotebook * +vinagre_notebook_new (VinagreWindow *window) +{ + return VINAGRE_NOTEBOOK (g_object_new (VINAGRE_TYPE_NOTEBOOK, "window", window, NULL)); +} + +void +vinagre_notebook_show_hide_tabs (VinagreNotebook *nb) +{ + gboolean always, fs; + gint n; + + fs = vinagre_window_is_fullscreen (nb->priv->window); + n = gtk_notebook_get_n_pages (GTK_NOTEBOOK (nb)); + + g_object_get (vinagre_prefs_get_default (), + "always-show-tabs", &always, + NULL); + + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nb), + ((n > 1) || (always)) && !fs); +} + +static void +drag_data_get_handl (GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint target_type, + guint time, + VinagreTab *tab) +{ + gchar *uri, *name, *data; + VinagreConnection *conn; + + g_assert (selection_data != NULL); + + switch (target_type) + { + case TARGET_VINAGRE: + conn = vinagre_tab_get_conn (tab); + uri = vinagre_connection_get_string_rep (conn, TRUE); + name = vinagre_connection_get_best_name (conn); + data = g_strdup_printf ("%s||%s", name, uri); + + /*FIXME: Set other properties of the connection*/ + gtk_selection_data_set (selection_data, + selection_data->target, + 8, + (guchar*) data, + strlen (data)); + + g_free (data); + g_free (name); + g_free (uri); + break; + + case TARGET_STRING: + /*FIXME: Create a .VNC file*/ + break; + + default: + g_assert_not_reached (); + } +} + +static void +vinagre_notebook_update_ui_sentitivity (VinagreNotebook *nb) +{ + gboolean active; + GtkActionGroup *action_group; + + active = gtk_notebook_get_n_pages (GTK_NOTEBOOK (nb)) > 0; + action_group = vinagre_window_get_connected_action (nb->priv->window); + gtk_action_group_set_sensitive (action_group, active); + + action_group = vinagre_window_get_initialized_action (nb->priv->window); + active = (nb->priv->active_tab) && + (vinagre_tab_get_state (VINAGRE_TAB (nb->priv->active_tab)) == VINAGRE_TAB_STATE_CONNECTED); + gtk_action_group_set_sensitive (action_group, active); + + if (nb->priv->active_tab) + { + GtkWidget *spinner, *icon; + + spinner = g_object_get_data (G_OBJECT (nb->priv->active_tab), "spinner"); + icon = g_object_get_data (G_OBJECT (nb->priv->active_tab), "icon"); + + if (vinagre_tab_get_state (VINAGRE_TAB (nb->priv->active_tab)) == VINAGRE_TAB_STATE_CONNECTED) + { + gtk_widget_hide (spinner); + vinagre_spinner_stop (VINAGRE_SPINNER (spinner)); + gtk_widget_show (icon); + } + else + { + gtk_widget_hide (icon); + gtk_widget_show (spinner); + vinagre_spinner_start (VINAGRE_SPINNER (spinner)); + } + } +} + +static void +vinagre_notebook_update_window_title (VinagreNotebook *nb) +{ + gchar *title, *name, *extra; + + if (nb->priv->active_tab == NULL) + { + gtk_window_set_title (GTK_WINDOW (nb->priv->window), g_get_application_name ()); + return; + } + + extra = vinagre_tab_get_extra_title (nb->priv->active_tab); + name = vinagre_connection_get_best_name (vinagre_tab_get_conn (nb->priv->active_tab)); + if (extra) + title = g_strdup_printf ("%s %s - %s", + name, + extra, + g_get_application_name ()); + else + title = g_strdup_printf ("%s - %s", + name, + g_get_application_name ()); + + gtk_window_set_title (GTK_WINDOW (nb->priv->window), title); + g_free (title); + g_free (extra); + g_free (name); +} + +static void +insert_actions_ui (VinagreNotebook *nb, GtkActionGroup *action_group, const GSList *actions) +{ + VinagreTabUiAction *action; + const gchar *name; + gint i; + + while (actions) + { + action = (VinagreTabUiAction *) actions->data; + name = gtk_action_get_name (action->action); + + gtk_action_group_add_action (action_group, action->action); + + for (i = 0; i < g_strv_length (action->paths); i++) + gtk_ui_manager_add_ui (nb->priv->manager, + nb->priv->ui_merge_id, + action->paths[i], + name, + name, + GTK_UI_MANAGER_AUTO, + FALSE); + + actions = actions->next; + } +} + +static void +merge_tab_ui (VinagreNotebook *nb) +{ + const GSList *actions; + GtkActionGroup *action_group; + + if (!nb->priv->active_tab) + return; + + /* Always sensitive actions */ + action_group = vinagre_window_get_always_sensitive_action (nb->priv->window); + actions = vinagre_tab_get_always_sensitive_actions (nb->priv->active_tab); + insert_actions_ui (nb, action_group, actions); + + /* Connected actions */ + action_group = vinagre_window_get_connected_action (nb->priv->window); + actions = vinagre_tab_get_connected_actions (nb->priv->active_tab); + insert_actions_ui (nb, action_group, actions); + + /* Initialized actions */ + action_group = vinagre_window_get_initialized_action (nb->priv->window); + actions = vinagre_tab_get_initialized_actions (nb->priv->active_tab); + insert_actions_ui (nb, action_group, actions); +} + +static void +remove_actions_ui (VinagreNotebook *nb, GtkActionGroup *action_group, const GSList *actions) +{ + VinagreTabUiAction *action; + + while (actions) + { + action = (VinagreTabUiAction *) actions->data; + + gtk_action_group_remove_action (action_group, action->action); + actions = actions->next; + } +} + +static void +unmerge_tab_ui (VinagreNotebook *nb) +{ + const GSList *actions; + GtkActionGroup *action_group; + + if (!nb->priv->active_tab) + return; + + gtk_ui_manager_remove_ui (nb->priv->manager, + nb->priv->ui_merge_id); + + /* Always sensitive actions */ + action_group = vinagre_window_get_always_sensitive_action (nb->priv->window); + actions = vinagre_tab_get_always_sensitive_actions (nb->priv->active_tab); + remove_actions_ui (nb, action_group, actions); + + /* Connected actions */ + action_group = vinagre_window_get_connected_action (nb->priv->window); + actions = vinagre_tab_get_connected_actions (nb->priv->active_tab); + remove_actions_ui (nb, action_group, actions); + + /* Initialized actions */ + action_group = vinagre_window_get_initialized_action (nb->priv->window); + actions = vinagre_tab_get_initialized_actions (nb->priv->active_tab); + remove_actions_ui (nb, action_group, actions); +} + +static void +vinagre_notebook_page_switched (GtkNotebook *notebook, + GtkNotebookPage *pg, + gint page_num, + gpointer data) +{ + VinagreNotebook *nb = VINAGRE_NOTEBOOK (notebook); + VinagreTab *tab; + + tab = VINAGRE_TAB (gtk_notebook_get_nth_page (notebook, page_num)); + if (tab == nb->priv->active_tab) + return; + + unmerge_tab_ui (nb); + nb->priv->active_tab = tab; + merge_tab_ui (nb); + + vinagre_notebook_update_window_title (nb); + vinagre_notebook_update_ui_sentitivity (nb); +} + +static void +vinagre_notebook_page_removed_cb (VinagreNotebook *nb) +{ + gint n; + + if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK (nb)) == 0) && + (vinagre_window_is_fullscreen (nb->priv->window))) + vinagre_window_toggle_fullscreen (nb->priv->window); + +vinagre_notebook_show_hide_tabs (nb); +} + +static void +vinagre_notebook_init (VinagreNotebook *nb) +{ + nb->priv = VINAGRE_NOTEBOOK_GET_PRIVATE (nb); + nb->priv->active_tab = NULL; + nb->priv->tabs = NULL; + + gtk_notebook_set_scrollable (GTK_NOTEBOOK (nb), TRUE); + + g_signal_connect (nb, + "page-added", + G_CALLBACK (vinagre_notebook_show_hide_tabs), + NULL); + g_signal_connect (nb, + "page-removed", + G_CALLBACK (vinagre_notebook_page_removed_cb), + NULL); + g_signal_connect (nb, + "switch-page", + G_CALLBACK (vinagre_notebook_page_switched), + NULL); + g_signal_connect_swapped (vinagre_prefs_get_default (), + "notify::always-show-tabs", + G_CALLBACK (vinagre_notebook_show_hide_tabs), + nb); +} + +static void +close_button_clicked_cb (GtkWidget *widget, + GtkWidget *tab) +{ + VinagreNotebook *notebook; + + notebook = VINAGRE_NOTEBOOK (gtk_widget_get_parent (tab)); + vinagre_notebook_close_tab (notebook, VINAGRE_TAB (tab)); +} + +static void +vinagre_notebook_update_tab_tooltip (VinagreNotebook *nb, VinagreTab *tab) +{ + char *str; + GtkWidget *label; + + label = GTK_WIDGET (g_object_get_data (G_OBJECT (tab), "label-ebox")); + g_return_if_fail (label != NULL); + + str = vinagre_tab_get_tooltip (tab); + gtk_widget_set_tooltip_markup (label, str); + + g_free (str); +} + +static void +tab_tooltip_changed_cb (GObject *object, GParamSpec *pspec, VinagreNotebook *nb) +{ + vinagre_notebook_update_tab_tooltip (nb, VINAGRE_TAB (object)); +} + +static void +tab_disconnected_cb (VinagreTab *tab, VinagreNotebook *nb) +{ + gchar *message, *name, *emphasis; + + name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab)); + emphasis = g_strdup_printf ("%s", name); + /* Translators: %s is a host name or IP address. */ + message = g_strdup_printf (_("Connection to host %s was closed."), + emphasis); + vinagre_utils_show_error (_("Connection closed"), message, GTK_WINDOW (nb->priv->window)); + g_free (message); + g_free (name); + g_free (emphasis); + + vinagre_notebook_close_tab (nb, tab); +} + +static void +tab_auth_failed_cb (VinagreTab *tab, const gchar *msg, VinagreNotebook *nb) +{ + GString *message; + gchar *name, *emphasis; + + message = g_string_new (NULL); + name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab)); + + emphasis = g_strdup_printf ("%s", name); + /* Translators: %s is a host name or IP address. */ + g_string_printf (message, _("Authentication to host %s has failed"), + emphasis); + if (msg) + g_string_append_printf (message, " (%s)", msg); + g_string_append_c (message, '.'); + + vinagre_utils_show_error (_("Authentication failed"), message->str, GTK_WINDOW (nb->priv->window)); + g_string_free (message, TRUE); + g_free (name); + g_free (emphasis); + + vinagre_notebook_close_tab (nb, tab); +} + +static void +tab_initialized_cb (VinagreTab *tab, VinagreNotebook *nb) +{ + VinagreConnection *conn = vinagre_tab_get_conn (tab); + + vinagre_notebook_update_ui_sentitivity (nb); + vinagre_notebook_update_tab_tooltip (nb, tab); + vinagre_notebook_update_window_title (nb); + + if (vinagre_connection_get_fullscreen (conn) && (!vinagre_window_is_fullscreen (nb->priv->window))) + vinagre_window_toggle_fullscreen (nb->priv->window); +} + +static GtkWidget * +build_tab_label (VinagreNotebook *nb, + VinagreTab *tab) +{ + GtkWidget *hbox, *label_hbox, *label_ebox; + GtkWidget *label, *dummy_label; + GtkWidget *close_button, *spinner; + GtkRcStyle *rcstyle; + GtkWidget *image; + GtkWidget *icon; + gchar *name; + + hbox = gtk_hbox_new (FALSE, 4); + + label_ebox = gtk_event_box_new (); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (label_ebox), FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label_ebox, TRUE, TRUE, 0); + gtk_widget_set_tooltip_text (label_ebox, _("Connecting...")); + + label_hbox = gtk_hbox_new (FALSE, 4); + gtk_container_add (GTK_CONTAINER (label_ebox), label_hbox); + + /* setup close button */ + close_button = gtk_button_new (); + gtk_button_set_relief (GTK_BUTTON (close_button), + GTK_RELIEF_NONE); + + /* don't allow focus on the close button */ + gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); + + /* make it as small as possible */ + rcstyle = gtk_rc_style_new (); + rcstyle->xthickness = rcstyle->ythickness = 0; + gtk_widget_modify_style (close_button, rcstyle); + g_object_unref (rcstyle); + gint w, h; + gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); + gtk_widget_set_size_request (GTK_WIDGET (close_button), w+2, h+2); + + image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, + GTK_ICON_SIZE_MENU); + gtk_container_add (GTK_CONTAINER (close_button), image); + gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); + + gtk_widget_set_tooltip_text (close_button, _("Close connection")); + + g_signal_connect (close_button, + "clicked", + G_CALLBACK (close_button_clicked_cb), + tab); + + /* setup spinner */ + spinner = vinagre_spinner_new (); + vinagre_spinner_set_size (VINAGRE_SPINNER (spinner), GTK_ICON_SIZE_MENU); + gtk_box_pack_start (GTK_BOX (label_hbox), spinner, FALSE, FALSE, 0); + + /* setup site icon */ + icon = gtk_image_new_from_icon_name (vinagre_tab_get_icon_name (tab), + GTK_ICON_SIZE_MENU); + gtk_box_pack_start (GTK_BOX (label_hbox), icon, FALSE, FALSE, 0); + + /* setup label */ + name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab)); + label = gtk_label_new (name); + g_free (name); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_misc_set_padding (GTK_MISC (label), 0, 0); + gtk_box_pack_start (GTK_BOX (label_hbox), label, FALSE, FALSE, 0); + + dummy_label = gtk_label_new (""); + gtk_box_pack_start (GTK_BOX (label_hbox), dummy_label, TRUE, TRUE, 0); + + gtk_widget_show (hbox); + gtk_widget_show (label_ebox); + gtk_widget_show (label_hbox); + gtk_widget_show (label); + gtk_widget_show (dummy_label); + gtk_widget_show (image); + gtk_widget_show (close_button); + + g_object_set_data (G_OBJECT (hbox), "label", label); + g_object_set_data (G_OBJECT (tab), "label", label); + g_object_set_data (G_OBJECT (hbox), "label-ebox", label_ebox); + g_object_set_data (G_OBJECT (tab), "label-ebox", label_ebox); + g_object_set_data (G_OBJECT (tab), "spinner", spinner); + g_object_set_data (G_OBJECT (tab), "icon", icon); + g_object_set_data (G_OBJECT (hbox), "close-button", close_button); + g_object_set_data (G_OBJECT (tab), "close-button", close_button); + + gtk_drag_source_set ( GTK_WIDGET (hbox), + GDK_BUTTON1_MASK, + vinagre_target_list, + G_N_ELEMENTS (vinagre_target_list), + GDK_ACTION_COPY ); + g_signal_connect (hbox, + "drag-data-get", + G_CALLBACK (drag_data_get_handl), + tab); + + return hbox; +} + +void +vinagre_notebook_add_tab (VinagreNotebook *nb, + VinagreTab *tab, + gint position) +{ + GtkWidget *label; + GtkActionGroup *action_group; + int pos; + + g_return_if_fail (VINAGRE_IS_NOTEBOOK (nb)); + g_return_if_fail (VINAGRE_IS_TAB (tab)); + + /* Unmerge the UI for the current tab */ + unmerge_tab_ui (nb); + + nb->priv->active_tab = tab; + nb->priv->tabs = g_slist_append (nb->priv->tabs, tab); + + /* Merge the UI for the new tab */ + merge_tab_ui (nb); + + /* Actually add the new tab */ + label = build_tab_label (nb, tab); + pos = gtk_notebook_insert_page (GTK_NOTEBOOK (nb), + GTK_WIDGET (tab), + label, + position); + + gtk_notebook_set_current_page (GTK_NOTEBOOK (nb), pos); + vinagre_tab_set_notebook (tab, nb); + + g_signal_connect (tab, + "notify::tooltip", + G_CALLBACK (tab_tooltip_changed_cb), + nb); + + g_signal_connect (tab, + "tab-disconnected", + G_CALLBACK (tab_disconnected_cb), + nb); + + g_signal_connect (tab, + "tab-auth-failed", + G_CALLBACK (tab_auth_failed_cb), + nb); + + g_signal_connect (tab, + "tab-initialized", + G_CALLBACK (tab_initialized_cb), + nb); + + vinagre_notebook_update_window_title (nb); + vinagre_notebook_update_ui_sentitivity (nb); +} + +void +vinagre_notebook_close_tab (VinagreNotebook *nb, + VinagreTab *tab) +{ + gint position; + GtkActionGroup *action_group; + GtkNotebook *notebook; + VinagreTab *previous_active_tab; + + g_return_if_fail (VINAGRE_IS_NOTEBOOK (nb)); + g_return_if_fail (VINAGRE_IS_TAB (tab)); + + notebook = GTK_NOTEBOOK (nb); + previous_active_tab = nb->priv->active_tab; + + g_signal_handlers_disconnect_by_func (tab, + G_CALLBACK (tab_disconnected_cb), + nb); + g_signal_handlers_disconnect_by_func (tab, + G_CALLBACK (tab_auth_failed_cb), + nb); + + /* If it's closing the current tab, unmerge the UI */ + if (nb->priv->active_tab == tab) + unmerge_tab_ui (nb); + + position = gtk_notebook_page_num (notebook, GTK_WIDGET (tab)); + g_signal_handlers_block_by_func (notebook, vinagre_notebook_page_switched, NULL); + gtk_notebook_remove_page (notebook, position); + g_signal_handlers_unblock_by_func (notebook, vinagre_notebook_page_switched, NULL); + + position = gtk_notebook_get_current_page (notebook); + nb->priv->active_tab = VINAGRE_TAB (gtk_notebook_get_nth_page (notebook, + position)); + nb->priv->tabs = g_slist_remove (nb->priv->tabs, tab); + + /* Merge the UI for the new tab (if one exists) */ + if (nb->priv->active_tab != previous_active_tab) + { + merge_tab_ui (nb); + vinagre_notebook_update_window_title (nb); + vinagre_notebook_update_ui_sentitivity (nb); + } +} + +static void +close_tab (VinagreTab *tab, + VinagreNotebook *nb) +{ + vinagre_notebook_close_tab (nb, tab); +} + +void +vinagre_notebook_close_all_tabs (VinagreNotebook *nb) +{ + g_return_if_fail (VINAGRE_IS_NOTEBOOK (nb)); + + gtk_container_foreach (GTK_CONTAINER (nb), + (GtkCallback) close_tab, + nb); +} + +void +vinagre_notebook_close_active_tab (VinagreNotebook *nb) +{ + g_return_if_fail (VINAGRE_IS_NOTEBOOK (nb)); + g_return_if_fail (nb->priv->active_tab != NULL); + + vinagre_notebook_close_tab (nb, nb->priv->active_tab); +} + +VinagreTab * +vinagre_notebook_get_active_tab (VinagreNotebook *nb) +{ + g_return_val_if_fail (VINAGRE_IS_NOTEBOOK (nb), NULL); + + return nb->priv->active_tab; +} + +GSList * +vinagre_notebook_get_tabs (VinagreNotebook *nb) +{ + g_return_val_if_fail (VINAGRE_IS_NOTEBOOK (nb), NULL); + + return nb->priv->tabs; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-notebook.h vinagre-2.29.1/vinagre/vinagre-notebook.h --- vinagre-2.26.1/vinagre/vinagre-notebook.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-notebook.h 2009-08-13 15:53:37.000000000 +0100 @@ -0,0 +1,72 @@ +/* + * vinagre-notebook.h + * This file is part of vinagre + * + * Copyright (C) 2007,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_NOTEBOOK_H__ +#define __VINAGRE_NOTEBOOK_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_NOTEBOOK (vinagre_notebook_get_type ()) +#define VINAGRE_NOTEBOOK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), VINAGRE_TYPE_NOTEBOOK, VinagreNotebook)) +#define VINAGRE_NOTEBOOK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookClass)) +#define VINAGRE_IS_NOTEBOOK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), VINAGRE_TYPE_NOTEBOOK)) +#define VINAGRE_IS_NOTEBOOK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), VINAGRE_TYPE_NOTEBOOK)) +#define VINAGRE_NOTEBOOK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookClass)) + +typedef struct _VinagreNotebookPrivate VinagreNotebookPrivate; +typedef struct _VinagreNotebookClass VinagreNotebookClass; +typedef struct _VinagreNotebook VinagreNotebook; + +#include "vinagre-window.h" +#include "vinagre-tab.h" + +struct _VinagreNotebook +{ + GtkNotebook notebook; + VinagreNotebookPrivate *priv; +}; + +struct _VinagreNotebookClass +{ + GtkNotebookClass parent_class; +}; + +GType vinagre_notebook_get_type (void) G_GNUC_CONST; +VinagreNotebook * vinagre_notebook_new (VinagreWindow *window); + +void vinagre_notebook_add_tab (VinagreNotebook *nb, + VinagreTab *tab, + gint position); +void vinagre_notebook_close_tab (VinagreNotebook *nb, + VinagreTab *tab); +void vinagre_notebook_close_all_tabs (VinagreNotebook *nb); +void vinagre_notebook_close_active_tab (VinagreNotebook *nb); + +void vinagre_notebook_show_hide_tabs (VinagreNotebook *nb); + +VinagreTab * vinagre_notebook_get_active_tab (VinagreNotebook *nb); +GSList * vinagre_notebook_get_tabs (VinagreNotebook *nb); + +G_END_DECLS + +#endif /* __VINAGRE_NOTEBOOK_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-object-module.c vinagre-2.29.1/vinagre/vinagre-object-module.c --- vinagre-2.26.1/vinagre/vinagre-object-module.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-object-module.c 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,343 @@ +/* + * vinagre-object-module.c + * This file is part of vinagre + * + * Copyright (C) 2005 - Paolo Maggi + * Copyright (C) 2008 - Jesse van den Kieboom + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* This is a modified version of ephy-module.c from Epiphany source code. + * Here the original copyright assignment: + * + * Copyright (C) 2003 Marco Pesenti Gritti + * Copyright (C) 2003, 2004 Christian Persch + * + */ + +/* + * Modified by the vinagre Team, 2005. See the AUTHORS file for a + * list of people on the vinagre Team. + * See the ChangeLog files for a list of changes. + * + * $Id: vinagre-module.c 6314 2008-06-05 12:57:53Z pborelli $ + */ + +#include "config.h" + +#include "vinagre-object-module.h" +#include "vinagre-debug.h" + +typedef GType (*VinagreObjectModuleRegisterFunc) (GTypeModule *); + +enum { + PROP_0, + PROP_MODULE_NAME, + PROP_PATH, + PROP_TYPE_REGISTRATION, + PROP_RESIDENT +}; + +struct _VinagreObjectModulePrivate +{ + GModule *library; + + GType type; + gchar *path; + gchar *module_name; + gchar *type_registration; + + gboolean resident; +}; + +G_DEFINE_TYPE (VinagreObjectModule, vinagre_object_module, G_TYPE_TYPE_MODULE); + +static gboolean +vinagre_object_module_load (GTypeModule *gmodule) +{ + VinagreObjectModule *module = VINAGRE_OBJECT_MODULE (gmodule); + VinagreObjectModuleRegisterFunc register_func; + gchar *path; + + vinagre_debug_message (DEBUG_PLUGINS, "Loading %s module from %s", + module->priv->module_name, module->priv->path); + + path = g_module_build_path (module->priv->path, module->priv->module_name); + g_return_val_if_fail (path != NULL, FALSE); + vinagre_debug_message (DEBUG_PLUGINS, "Module filename: %s", path); + + module->priv->library = g_module_open (path, + G_MODULE_BIND_LAZY); + g_free (path); + + if (module->priv->library == NULL) + { + g_warning ("%s: %s", module->priv->module_name, g_module_error()); + + return FALSE; + } + + /* extract symbols from the lib */ + if (!g_module_symbol (module->priv->library, module->priv->type_registration, + (void *) ®ister_func)) + { + g_warning ("%s: %s", module->priv->module_name, g_module_error()); + g_module_close (module->priv->library); + + return FALSE; + } + + /* symbol can still be NULL even though g_module_symbol + * returned TRUE */ + if (register_func == NULL) + { + g_warning ("Symbol '%s' should not be NULL", module->priv->type_registration); + g_module_close (module->priv->library); + + return FALSE; + } + + module->priv->type = register_func (gmodule); + + if (module->priv->type == 0) + { + g_warning ("Invalid object contained by module %s", module->priv->module_name); + return FALSE; + } + + if (module->priv->resident) + { + g_module_make_resident (module->priv->library); + } + + return TRUE; +} + +static void +vinagre_object_module_unload (GTypeModule *gmodule) +{ + VinagreObjectModule *module = VINAGRE_OBJECT_MODULE (gmodule); + + vinagre_debug_message (DEBUG_PLUGINS, "Unloading %s", module->priv->path); + + g_module_close (module->priv->library); + + module->priv->library = NULL; + module->priv->type = 0; +} + +static void +vinagre_object_module_init (VinagreObjectModule *module) +{ + vinagre_debug_message (DEBUG_PLUGINS, "VinagreObjectModule %p initialising", module); + + module->priv = G_TYPE_INSTANCE_GET_PRIVATE (module, + VINAGRE_TYPE_OBJECT_MODULE, + VinagreObjectModulePrivate); +} + +static void +vinagre_object_module_finalize (GObject *object) +{ + VinagreObjectModule *module = VINAGRE_OBJECT_MODULE (object); + + vinagre_debug_message (DEBUG_PLUGINS, "VinagreObjectModule %p finalising", module); + + g_free (module->priv->path); + g_free (module->priv->module_name); + g_free (module->priv->type_registration); + + G_OBJECT_CLASS (vinagre_object_module_parent_class)->finalize (object); +} + +static void +vinagre_object_module_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + VinagreObjectModule *module = VINAGRE_OBJECT_MODULE (object); + + switch (prop_id) + { + case PROP_MODULE_NAME: + g_value_set_string (value, module->priv->module_name); + break; + case PROP_PATH: + g_value_set_string (value, module->priv->path); + break; + case PROP_TYPE_REGISTRATION: + g_value_set_string (value, module->priv->type_registration); + break; + case PROP_RESIDENT: + g_value_set_boolean (value, module->priv->resident); + break; + default: + g_return_if_reached (); + } +} + +static void +vinagre_object_module_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + VinagreObjectModule *module = VINAGRE_OBJECT_MODULE (object); + + switch (prop_id) + { + case PROP_MODULE_NAME: + module->priv->module_name = g_value_dup_string (value); + g_type_module_set_name (G_TYPE_MODULE (object), + module->priv->module_name); + break; + case PROP_PATH: + module->priv->path = g_value_dup_string (value); + break; + case PROP_TYPE_REGISTRATION: + module->priv->type_registration = g_value_dup_string (value); + break; + case PROP_RESIDENT: + module->priv->resident = g_value_get_boolean (value); + break; + default: + g_return_if_reached (); + } +} + +static void +vinagre_object_module_class_init (VinagreObjectModuleClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (klass); + + object_class->set_property = vinagre_object_module_set_property; + object_class->get_property = vinagre_object_module_get_property; + object_class->finalize = vinagre_object_module_finalize; + + module_class->load = vinagre_object_module_load; + module_class->unload = vinagre_object_module_unload; + + g_object_class_install_property (object_class, + PROP_MODULE_NAME, + g_param_spec_string ("module-name", + "Module Name", + "The module to load for this object", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + + g_object_class_install_property (object_class, + PROP_PATH, + g_param_spec_string ("path", + "Path", + "The path to use when loading this module", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + + g_object_class_install_property (object_class, + PROP_TYPE_REGISTRATION, + g_param_spec_string ("type-registration", + "Type Registration", + "The name of the type registration function", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + + g_object_class_install_property (object_class, + PROP_RESIDENT, + g_param_spec_boolean ("resident", + "Resident", + "Whether the module is resident", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + + g_type_class_add_private (klass, sizeof (VinagreObjectModulePrivate)); +} + +VinagreObjectModule * +vinagre_object_module_new (const gchar *module_name, + const gchar *path, + const gchar *type_registration, + gboolean resident) +{ + return (VinagreObjectModule *)g_object_new (VINAGRE_TYPE_OBJECT_MODULE, + "module-name", + module_name, + "path", + path, + "type-registration", + type_registration, + "resident", + resident, + NULL); +} + +GObject * +vinagre_object_module_new_object (VinagreObjectModule *module, + const gchar *first_property_name, + ...) +{ + va_list var_args; + GObject *result; + + g_return_val_if_fail (module->priv->type != 0, NULL); + + vinagre_debug_message (DEBUG_PLUGINS, "Creating object of type %s", + g_type_name (module->priv->type)); + + va_start (var_args, first_property_name); + result = g_object_new_valist (module->priv->type, first_property_name, var_args); + va_end (var_args); + + return result; +} + +const gchar * +vinagre_object_module_get_path (VinagreObjectModule *module) +{ + g_return_val_if_fail (VINAGRE_IS_OBJECT_MODULE (module), NULL); + + return module->priv->path; +} + +const gchar * +vinagre_object_module_get_module_name (VinagreObjectModule *module) +{ + g_return_val_if_fail (VINAGRE_IS_OBJECT_MODULE (module), NULL); + + return module->priv->module_name; +} + +const gchar * +vinagre_object_module_get_type_registration (VinagreObjectModule *module) +{ + g_return_val_if_fail (VINAGRE_IS_OBJECT_MODULE (module), NULL); + + return module->priv->type_registration; +} + +GType +vinagre_object_module_get_object_type (VinagreObjectModule *module) +{ + g_return_val_if_fail (VINAGRE_IS_OBJECT_MODULE (module), 0); + + return module->priv->type; +} diff -Nru vinagre-2.26.1/vinagre/vinagre-object-module.h vinagre-2.29.1/vinagre/vinagre-object-module.h --- vinagre-2.26.1/vinagre/vinagre-object-module.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-object-module.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,94 @@ +/* + * vinagre-object-module.h + * This file is part of vinagre + * + * Copyright (C) 2005 - Paolo Maggi + * Copyright (C) 2008 - Jesse van den Kieboom + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* This is a modified version of vinagre-module.h from Epiphany source code. + * Here the original copyright assignment: + * + * Copyright (C) 2003 Marco Pesenti Gritti + * Copyright (C) 2003, 2004 Christian Persch + * + */ + +/* + * Modified by the vinagre Team, 2005. See the AUTHORS file for a + * list of people on the vinagre Team. + * See the ChangeLog files for a list of changes. + * + * $Id: vinagre-module.h 6263 2008-05-05 10:52:10Z sfre $ + */ + +#ifndef __VINAGRE_OBJECT_MODULE_H__ +#define __VINAGRE_OBJECT_MODULE_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_OBJECT_MODULE (vinagre_object_module_get_type ()) +#define VINAGRE_OBJECT_MODULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_OBJECT_MODULE, VinagreObjectModule)) +#define VINAGRE_OBJECT_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_OBJECT_MODULE, VinagreObjectModuleClass)) +#define VINAGRE_IS_OBJECT_MODULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_OBJECT_MODULE)) +#define VINAGRE_IS_OBJECT_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_OBJECT_MODULE)) +#define VINAGRE_OBJECT_MODULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_OBJECT_MODULE, VinagreObjectModuleClass)) + +typedef struct _VinagreObjectModule VinagreObjectModule; +typedef struct _VinagreObjectModulePrivate VinagreObjectModulePrivate; + +struct _VinagreObjectModule +{ + GTypeModule parent; + + VinagreObjectModulePrivate *priv; +}; + +typedef struct _VinagreObjectModuleClass VinagreObjectModuleClass; + +struct _VinagreObjectModuleClass +{ + GTypeModuleClass parent_class; + + /* Virtual class methods */ + void (* garbage_collect) (); +}; + +GType vinagre_object_module_get_type (void) G_GNUC_CONST; + +VinagreObjectModule *vinagre_object_module_new (const gchar *module_name, + const gchar *path, + const gchar *type_registration, + gboolean resident); + +GObject *vinagre_object_module_new_object (VinagreObjectModule *module, + const gchar *first_property_name, + ...); + +GType vinagre_object_module_get_object_type (VinagreObjectModule *module); +const gchar *vinagre_object_module_get_path (VinagreObjectModule *module); +const gchar *vinagre_object_module_get_module_name (VinagreObjectModule *module); +const gchar *vinagre_object_module_get_type_registration (VinagreObjectModule *module); + +G_END_DECLS + +#endif diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin.c vinagre-2.29.1/vinagre/vinagre-plugin.c --- vinagre-2.26.1/vinagre/vinagre-plugin.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,587 @@ +/* + * vinagre-plugin.c + * This file is part of vinagre + + * Based on gedit plugin system + * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2009 Jorge Pereira + * Copyright (C) 2009 Jonh Wendell + * + * vinagre-plugin.c 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. + * + * vinagre-plugin.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "vinagre-plugin.h" +#include "vinagre-plugin-info.h" +#include "vinagre-dirs.h" + +/* properties */ +enum { + PROP_0, + PROP_INSTALL_DIR, + PROP_DATA_DIR_NAME, + PROP_DATA_DIR +}; + +typedef struct _VinagrePluginPrivate VinagrePluginPrivate; + +struct _VinagrePluginPrivate +{ + gchar *install_dir; + gchar *data_dir_name; +}; + +#define VINAGRE_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_PLUGIN, VinagrePluginPrivate)) + +G_DEFINE_TYPE(VinagrePlugin, vinagre_plugin, G_TYPE_OBJECT) + +static void +dummy (VinagrePlugin *plugin, VinagreWindow *window) +{ + /* Empty */ +} + +static GtkWidget * +create_configure_dialog (VinagrePlugin *plugin) +{ + return NULL; +} + +static GSList * +default_context_groups (VinagrePlugin *plugin) +{ + return NULL; +} + +static const gchar * +default_get_protocol (VinagrePlugin *plugin) +{ + return NULL; +} + +static gchar ** +default_get_public_description (VinagrePlugin *plugin) +{ + return NULL; +} + +static VinagreConnection * +default_new_connection (VinagrePlugin *plugin) +{ + return NULL; +} + +static GtkWidget * +default_new_tab (VinagrePlugin *plugin, + VinagreConnection *conn, + VinagreWindow *window) +{ + return NULL; +} + +static VinagreConnection * +default_new_connection_from_file (VinagrePlugin *plugin, + const gchar *data, + gboolean use_bookmarks, + gchar **error_msg) +{ + return NULL; +} + +static gint +default_get_default_port (VinagrePlugin *plugin) +{ + return -1; +} + +static gboolean +is_configurable (VinagrePlugin *plugin) +{ + return (VINAGRE_PLUGIN_GET_CLASS (plugin)->create_configure_dialog != + create_configure_dialog); +} + +static GtkWidget * +default_get_connect_widget (VinagrePlugin *plugin, + VinagreConnection *initial_settings) +{ + return NULL; +} + +static GtkFileFilter * +default_get_file_filter (VinagrePlugin *plugin) +{ + return NULL; +} + +static void +vinagre_plugin_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + switch (prop_id) + { + case PROP_INSTALL_DIR: + g_value_take_string (value, vinagre_plugin_get_install_dir (VINAGRE_PLUGIN (object))); + break; + case PROP_DATA_DIR: + g_value_take_string (value, vinagre_plugin_get_data_dir (VINAGRE_PLUGIN (object))); + break; + default: + g_return_if_reached (); + } +} + +static void +vinagre_plugin_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + VinagrePluginPrivate *priv = VINAGRE_PLUGIN_GET_PRIVATE (object); + + switch (prop_id) + { + case PROP_INSTALL_DIR: + priv->install_dir = g_value_dup_string (value); + break; + case PROP_DATA_DIR_NAME: + priv->data_dir_name = g_value_dup_string (value); + break; + default: + g_return_if_reached (); + } +} + +static void +vinagre_plugin_finalize (GObject *object) +{ + VinagrePluginPrivate *priv = VINAGRE_PLUGIN_GET_PRIVATE (object); + + g_free (priv->install_dir); + g_free (priv->data_dir_name); + + G_OBJECT_CLASS (vinagre_plugin_parent_class)->finalize (object); +} + +static void +vinagre_plugin_class_init (VinagrePluginClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + klass->activate = dummy; + klass->deactivate = dummy; + klass->update_ui = dummy; + klass->get_context_groups = default_context_groups; + klass->get_protocol = default_get_protocol; + klass->get_public_description = default_get_public_description; + klass->get_default_port = default_get_default_port; + klass->new_connection = default_new_connection; + klass->new_connection_from_file = default_new_connection_from_file; + klass->get_mdns_service = default_get_protocol; + klass->new_tab = default_new_tab; + klass->get_connect_widget = default_get_connect_widget; + klass->get_file_filter = default_get_file_filter; + + klass->create_configure_dialog = create_configure_dialog; + klass->is_configurable = is_configurable; + + object_class->get_property = vinagre_plugin_get_property; + object_class->set_property = vinagre_plugin_set_property; + object_class->finalize = vinagre_plugin_finalize; + + g_object_class_install_property (object_class, + PROP_INSTALL_DIR, + g_param_spec_string ("install-dir", + "Install Directory", + "The directory where the plugin is installed", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); + + /* the basename of the data dir is set at construction time by the plugin loader + * while the full path is constructed on the fly to take into account relocability + * that's why we have a writeonly prop and a readonly prop */ + g_object_class_install_property (object_class, + PROP_DATA_DIR_NAME, + g_param_spec_string ("data-dir-name", + "Basename of the data directory", + "The basename of the directory where the plugin should look for its data files", + NULL, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (object_class, + PROP_DATA_DIR, + g_param_spec_string ("data-dir", + "Data Directory", + "The full path of the directory where the plugin should look for its data files", + NULL, + G_PARAM_READABLE)); + + g_type_class_add_private (klass, sizeof (VinagrePluginPrivate)); +} + +static void +vinagre_plugin_init (VinagrePlugin *plugin) +{ + /* Empty */ +} + +/** + * vinagre_plugin_get_install_dir: + * @plugin: a #VinagrePlugin + * + * Get the path of the directory where the plugin is installed. + * + * Return value: a newly allocated string with the path of the + * directory where the plugin is installed + */ +gchar * +vinagre_plugin_get_install_dir (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return g_strdup (VINAGRE_PLUGIN_GET_PRIVATE (plugin)->install_dir); +} + +/** + * vinagre_plugin_get_data_dir: + * @plugin: a #VinagrePlugin + * + * Get the path of the directory where the plugin should look for + * its data files. + * + * Return value: a newly allocated string with the path of the + * directory where the plugin should look for its data files + */ +gchar * +vinagre_plugin_get_data_dir (VinagrePlugin *plugin) +{ + VinagrePluginPrivate *priv; + gchar *vinagre_lib_dir; + gchar *data_dir; + + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + priv = VINAGRE_PLUGIN_GET_PRIVATE (plugin); + + /* If it's a "user" plugin the data dir is + * install_dir/data_dir_name if instead it's a + * "system" plugin the data dir is under vinagre_data_dir, + * so it's under $prefix/share/vinagre-2/plugins/data_dir_name + * where data_dir_name usually it's the name of the plugin + */ + vinagre_lib_dir = vinagre_dirs_get_vinagre_lib_dir (); + + /* CHECK: is checking the prefix enough or should we be more + * careful about normalizing paths etc? */ + if (g_str_has_prefix (priv->install_dir, vinagre_lib_dir)) + { + gchar *vinagre_data_dir; + + vinagre_data_dir = vinagre_dirs_get_vinagre_data_dir (); + + data_dir = g_build_filename (vinagre_data_dir, + "plugins", + priv->data_dir_name, + NULL); + + g_free (vinagre_data_dir); + } + else + { + data_dir = g_build_filename (priv->install_dir, + priv->data_dir_name, + NULL); + } + + g_free (vinagre_lib_dir); + + return data_dir; +} + +/** + * vinagre_plugin_activate: + * @plugin: a #VinagrePlugin + * @window: a #VinagreWindow + * + * Activates the plugin. + */ +void +vinagre_plugin_activate (VinagrePlugin *plugin, + VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_PLUGIN (plugin)); + + VINAGRE_PLUGIN_GET_CLASS (plugin)->activate (plugin, window); +} + +/** + * vinagre_plugin_deactivate: + * @plugin: a #VinagrePlugin + * @window: a #VinagreWindow + * + * Deactivates the plugin. + */ +void +vinagre_plugin_deactivate (VinagrePlugin *plugin, + VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_PLUGIN (plugin)); + + VINAGRE_PLUGIN_GET_CLASS (plugin)->deactivate (plugin, window); +} + +/** + * vinagre_plugin_update_ui: + * @plugin: a #VinagrePlugin + * @window: a #VinagreWindow + * + * Triggers an update of the user interface to take into account state changes + * caused by the plugin. + */ +void +vinagre_plugin_update_ui (VinagrePlugin *plugin, + VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_PLUGIN (plugin)); + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + VINAGRE_PLUGIN_GET_CLASS (plugin)->update_ui (plugin, window); +} + +/** + * vinagre_plugin_is_configurable: + * @plugin: a #VinagrePlugin + * + * Whether the plugin is configurable. + * + * Returns: TRUE if the plugin is configurable: + */ +gboolean +vinagre_plugin_is_configurable (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), FALSE); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->is_configurable (plugin); +} + +/** + * vinagre_plugin_create_configure_dialog: + * @plugin: a #VinagrePlugin + * + * Creates the configure dialog widget for the plugin. + * + * Returns: the configure dialog widget for the plugin. + */ +GtkWidget * +vinagre_plugin_create_configure_dialog (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->create_configure_dialog (plugin); +} + +/** + * vinagre_plugin_get_context_groups + * @plugin: a #VinagrePlugin + * + * + * Returns: a list of context groups to be used on command line, if available + */ +GSList * +vinagre_plugin_get_context_groups (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->get_context_groups (plugin); +} + +/** + * vinagre_plugin_get_protocol + * @plugin: a #VinagrePlugin + * + * + * Returns: a protocol, like "vnc" or "rdp" + */ +const gchar * +vinagre_plugin_get_protocol (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->get_protocol (plugin); +} + +/** + * vinagre_plugin_get_public_description + * @plugin: a #VinagrePlugin + * + * + * Returns: an array of strings: + * [0] -> the protocol name, like VNC, or SSH + * [1] -> the protocol description, like "A secure shell access" + */ +gchar ** +vinagre_plugin_get_public_description (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->get_public_description (plugin); +} + +/** + * vinagre_plugin_new_connection + * @plugin: a #VinagrePlugin + * + * + * Returns: a subclass of the Connection class + */ +VinagreConnection * +vinagre_plugin_new_connection (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->new_connection (plugin); +} + +/** + * vinagre_plugin_new_connection_from_file + * @plugin: a #VinagrePlugin + * + * + * Returns: a subclass of the Connection class + */ +VinagreConnection * +vinagre_plugin_new_connection_from_file (VinagrePlugin *plugin, + const gchar *data, + gboolean use_bookmarks, + gchar **error_msg) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->new_connection_from_file (plugin, data, use_bookmarks, error_msg); +} + +/** + * vinagre_plugin_get_default_port + * @plugin: a #VinagrePlugin + * + * + * Returns: the default port (ex: 5900 for vnc) + */ +gint +vinagre_plugin_get_default_port (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), -1); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->get_default_port (plugin); +} + +/** + * vinagre_plugin_get_mdns_service + * @plugin: a #VinagrePlugin + * + * + * Returns: a mDNS service for this plugin, like rfb.tcp + */ +const gchar * +vinagre_plugin_get_mdns_service (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->get_mdns_service (plugin); +} + +/** + * vinagre_plugin_new_tab + * @plugin: a #VinagreTab + * + * + * Returns: a subclass of the Tab class + */ +GtkWidget * +vinagre_plugin_new_tab (VinagrePlugin *plugin, + VinagreConnection *conn, + VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->new_tab (plugin, conn, window); +} + +/** + * vinagre_plugin_get_connect_widget + * @plugin: a #VinagrePlugin + * @initial_settings: a #VinagreConnection object, or NULL + * + * + * Returns: a widget to be put inside connect dialog + */ +GtkWidget * +vinagre_plugin_get_connect_widget (VinagrePlugin *plugin, + VinagreConnection *initial_settings) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->get_connect_widget (plugin, initial_settings); +} + +/** + * vinagre_plugin_get_file_filter + * @plugin: a #VinagrePlugin + * + * + * Returns: a filter to be used at Open File dialog + */ +GtkFileFilter * +vinagre_plugin_get_file_filter (VinagrePlugin *plugin) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + return VINAGRE_PLUGIN_GET_CLASS (plugin)->get_file_filter (plugin); +} + +GdkPixbuf * +vinagre_plugin_get_icon (VinagrePlugin *plugin, gint size) +{ + VinagrePluginInfo *info; + + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + info = g_object_get_data (G_OBJECT (plugin), "info"); + g_return_val_if_fail (info != NULL, NULL); + + return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), + vinagre_plugin_info_get_icon_name (info), + size, + 0, + NULL); +} + +const gchar * +vinagre_plugin_get_icon_name (VinagrePlugin *plugin) +{ + VinagrePluginInfo *info; + + g_return_val_if_fail (VINAGRE_IS_PLUGIN (plugin), NULL); + + info = g_object_get_data (G_OBJECT (plugin), "info"); + g_return_val_if_fail (info != NULL, NULL); + + return vinagre_plugin_info_get_icon_name (info); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin-dialog.c vinagre-2.29.1/vinagre/vinagre-plugin-dialog.c --- vinagre-2.26.1/vinagre/vinagre-plugin-dialog.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin-dialog.c 2009-07-28 13:35:40.000000000 +0100 @@ -0,0 +1,113 @@ +/* + * vinagre-plugins-dialog.c + * This file is part of vinagre + * + * Copyright (C) 2009 Jorge Pereira + * Copyright (C) 2009 Jonh Wendell + * + * vinagre-plugins-dialog.c 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. + * + * vinagre-plugins-dialog.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include + +#include "vinagre-plugin-dialog.h" +#include "vinagre-plugin-manager.h" +#include "vinagre-debug.h" + +static GtkWidget *plugin_dialog = NULL; + +#define VINAGRE_PLUGIN_DIALOG_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \ + VINAGRE_TYPE_PLUGIN_DIALOG, \ + VinagrePluginDialogPrivate)) + +struct _VinagrePluginDialogPrivate +{ + gint dummy; +}; + +G_DEFINE_TYPE(VinagrePluginDialog, vinagre_plugin_dialog, GTK_TYPE_DIALOG) + +static void +vinagre_plugin_dialog_class_init (VinagrePluginDialogClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (VinagrePluginDialogPrivate)); +} + +static void +dialog_response_handler (GtkDialog *dlg, gint res_id) +{ + switch (res_id) + { + case GTK_RESPONSE_CLOSE: + default: + gtk_widget_destroy (GTK_WIDGET (dlg)); + } +} + +static void +setup_plugins_page (VinagrePluginDialog *dlg) +{ + GtkWidget *page_content; + + page_content = vinagre_plugin_manager_new (); + g_return_if_fail (page_content != NULL); + + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + page_content); + + gtk_widget_show_all (page_content); +} + +static void +vinagre_plugin_dialog_init (VinagrePluginDialog *dlg) +{ + dlg->priv = VINAGRE_PLUGIN_DIALOG_GET_PRIVATE (dlg); + gtk_dialog_add_buttons (GTK_DIALOG (dlg), + GTK_STOCK_CLOSE, + GTK_RESPONSE_CLOSE, + NULL); + + gtk_window_set_title (GTK_WINDOW (dlg), _("Plugin Manager")); + gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE); + gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE); + gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE); + + g_signal_connect (dlg, + "response", + G_CALLBACK (dialog_response_handler), + NULL); + + setup_plugins_page (dlg); +} + +void +vinagre_plugin_dialog_show (GtkWindow *parent) +{ + if (plugin_dialog == NULL) + { + plugin_dialog = GTK_WIDGET (g_object_new (VINAGRE_TYPE_PLUGIN_DIALOG, NULL)); + g_signal_connect (plugin_dialog, + "destroy", + G_CALLBACK (gtk_widget_destroyed), + &plugin_dialog); + } + + if (GTK_IS_WINDOW (parent)) + gtk_window_set_transient_for (GTK_WINDOW (plugin_dialog), parent); + + gtk_window_present (GTK_WINDOW (plugin_dialog)); +} +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin-dialog.h vinagre-2.29.1/vinagre/vinagre-plugin-dialog.h --- vinagre-2.26.1/vinagre/vinagre-plugin-dialog.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin-dialog.h 2009-07-28 13:26:22.000000000 +0100 @@ -0,0 +1,58 @@ +/* + * vinagre-plugins-dialog.h + * This file is part of vinagre + * + * Copyright (C) 2009 Jorge Pereira + * + * vinagre-plugins-dialog.h 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. + * + * vinagre-plugins-dialog.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_PLUGIN_DIALOG_H__ +#define __VINAGRE_PLUGIN_DIALOG_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_PLUGIN_DIALOG (vinagre_plugin_dialog_get_type()) +#define VINAGRE_PLUGIN_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_PLUGIN_DIALOG, VinagrePluginDialog)) +#define VINAGRE_PLUGIN_DIALOG_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_PLUGIN_DIALOG, VinagrePluginDialog const)) +#define VINAGRE_PLUGIN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_PLUGIN_DIALOG, VinagrePluginDialogClass)) +#define VINAGRE_IS_PLUGIN_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_PLUGIN_DIALOG)) +#define VINAGRE_IS_PLUGIN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_PLUGIN_DIALOG)) +#define VINAGRE_PLUGIN_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_PLUGIN_DIALOG, VinagrePluginDialogClass)) + +typedef struct _VinagrePluginDialogPrivate VinagrePluginDialogPrivate; +typedef struct _VinagrePluginDialog VinagrePluginDialog; +typedef struct _VinagrePluginDialogClass VinagrePluginDialogClass; + +struct _VinagrePluginDialog +{ + GtkDialog dialog; + VinagrePluginDialogPrivate *priv; +}; + +struct _VinagrePluginDialogClass +{ + GtkDialogClass parent_class; +}; + +GType vinagre_plugin_dialog_get_type (void) G_GNUC_CONST; + +void vinagre_plugin_dialog_show (GtkWindow *parent); + +G_END_DECLS + +#endif /* __VINAGRE_PLUGIN_DIALOG_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin.h vinagre-2.29.1/vinagre/vinagre-plugin.h --- vinagre-2.26.1/vinagre/vinagre-plugin.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin.h 2009-08-11 19:56:07.000000000 +0100 @@ -0,0 +1,272 @@ +/* + * vinagre-plugin.h + * This file is part of vinagre + * + * Based on gedit plugin system + * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2009 Jonh Wendell s + * + * vinagre-plugin.h 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. + * + * vinagre-plugin.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_PLUGIN_H__ +#define __VINAGRE_PLUGIN_H__ + +#include + +#include "vinagre-window.h" + +/* TODO: add a .h file that includes all the .h files normally needed to + * develop a plugin */ + +G_BEGIN_DECLS + +/* + * Type checking and casting macros + */ +#define VINAGRE_TYPE_PLUGIN (vinagre_plugin_get_type()) +#define VINAGRE_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_PLUGIN, VinagrePlugin)) +#define VINAGRE_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_PLUGIN, VinagrePluginClass)) +#define VINAGRE_IS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_PLUGIN)) +#define VINAGRE_IS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_PLUGIN)) +#define VINAGRE_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_PLUGIN, VinagrePluginClass)) + +/* + * Main object structure + */ +typedef struct _VinagrePlugin VinagrePlugin; + +struct _VinagrePlugin +{ + GObject parent; +}; + +/* + * Class definition + */ +typedef struct _VinagrePluginClass VinagrePluginClass; + +struct _VinagrePluginClass +{ + GObjectClass parent_class; + + /* Virtual public methods */ + void (*activate) (VinagrePlugin *plugin, + VinagreWindow *window); + void (*deactivate) (VinagrePlugin *plugin, + VinagreWindow *window); + + void (*update_ui) (VinagrePlugin *plugin, + VinagreWindow *window); + + GtkWidget *(*create_configure_dialog) (VinagrePlugin *plugin); + + + /* Virtual methods specific to 'engine' plugins */ + GSList *(*get_context_groups) (VinagrePlugin *plugin); + const gchar *(*get_protocol) (VinagrePlugin *plugin); + gchar **(*get_public_description) (VinagrePlugin *plugin); + gint (*get_default_port) (VinagrePlugin *plugin); + VinagreConnection *(*new_connection) (VinagrePlugin *plugin); + VinagreConnection *(*new_connection_from_file)(VinagrePlugin *plugin, + const gchar *data, + gboolean use_bookmarks, + gchar **error_msg); + const gchar *(*get_mdns_service) (VinagrePlugin *plugin); + GtkWidget *(*new_tab) (VinagrePlugin *plugin, + VinagreConnection *conn, + VinagreWindow *window); + + GtkWidget *(*get_connect_widget) (VinagrePlugin *plugin, + VinagreConnection *initial_settings); + + GtkFileFilter *(*get_file_filter) (VinagrePlugin *plugin); + + /* Plugins should not override this, it's handled automatically by + the VinagrePluginClass */ + gboolean (*is_configurable) (VinagrePlugin *plugin); + + /* Padding for future expansion */ + void (*_vinagre_reserved1) (void); + void (*_vinagre_reserved2) (void); + void (*_vinagre_reserved3) (void); + void (*_vinagre_reserved4) (void); +}; + +/* + * Public methods + */ +GType vinagre_plugin_get_type (void) G_GNUC_CONST; + +gchar *vinagre_plugin_get_install_dir (VinagrePlugin *plugin); +gchar *vinagre_plugin_get_data_dir (VinagrePlugin *plugin); + +void vinagre_plugin_activate (VinagrePlugin *plugin, + VinagreWindow *window); +void vinagre_plugin_deactivate (VinagrePlugin *plugin, + VinagreWindow *window); + +void vinagre_plugin_update_ui (VinagrePlugin *plugin, + VinagreWindow *window); + +gboolean vinagre_plugin_is_configurable (VinagrePlugin *plugin); +GtkWidget *vinagre_plugin_create_configure_dialog (VinagrePlugin *plugin); + +GSList *vinagre_plugin_get_context_groups (VinagrePlugin *plugin); +const gchar *vinagre_plugin_get_protocol (VinagrePlugin *plugin); +gchar **vinagre_plugin_get_public_description (VinagrePlugin *plugin); +gint vinagre_plugin_get_default_port (VinagrePlugin *plugin); +VinagreConnection *vinagre_plugin_new_connection (VinagrePlugin *plugin); +VinagreConnection *vinagre_plugin_new_connection_from_file (VinagrePlugin *plugin, + const gchar *data, + gboolean use_bookmarks, + gchar **error_msg); +const gchar *vinagre_plugin_get_mdns_service (VinagrePlugin *plugin); + +GtkWidget *vinagre_plugin_new_tab (VinagrePlugin *plugin, + VinagreConnection *conn, + VinagreWindow *window); + +GtkWidget *vinagre_plugin_get_connect_widget (VinagrePlugin *plugin, + VinagreConnection *initial_settings); + +GtkFileFilter *vinagre_plugin_get_file_filter (VinagrePlugin *plugin); + +GdkPixbuf *vinagre_plugin_get_icon (VinagrePlugin *plugin, + gint size); +const gchar *vinagre_plugin_get_icon_name (VinagrePlugin *plugin); +/** + * VINAGRE_PLUGIN_REGISTER_TYPE_WITH_CODE(PluginName, plugin_name, CODE): + * + * Utility macro used to register plugins with additional code. + */ +#define VINAGRE_PLUGIN_REGISTER_TYPE_WITH_CODE(PluginName, plugin_name, CODE) \ + G_DEFINE_DYNAMIC_TYPE_EXTENDED (PluginName, \ + plugin_name, \ + VINAGRE_TYPE_PLUGIN, \ + 0, \ + GTypeModule *module G_GNUC_UNUSED = type_module; /* back compat */ \ + CODE) \ + \ +/* This is not very nice, but G_DEFINE_DYNAMIC wants it and our old macro \ + * did not support it */ \ +static void \ +plugin_name##_class_finalize (PluginName##Class *klass) \ +{ \ +} \ + \ + \ +G_MODULE_EXPORT GType \ +register_vinagre_plugin (GTypeModule *type_module) \ +{ \ + plugin_name##_register_type (type_module); \ + \ + return plugin_name##_get_type(); \ +} + +/** + * VINAGRE_PLUGIN_REGISTER_TYPE(PluginName, plugin_name): + * + * Utility macro used to register plugins. + */ +#define VINAGRE_PLUGIN_REGISTER_TYPE(PluginName, plugin_name) \ + VINAGRE_PLUGIN_REGISTER_TYPE_WITH_CODE(PluginName, plugin_name, ;) + +/** + * VINAGRE_PLUGIN_DEFINE_TYPE_WITH_CODE(ObjectName, object_name, PARENT_TYPE, CODE): + * + * Utility macro used to register gobject types in plugins with additional code. + * + * Deprecated: use G_DEFINE_DYNAMIC_TYPE_EXTENDED instead + */ +#define VINAGRE_PLUGIN_DEFINE_TYPE_WITH_CODE(ObjectName, object_name, PARENT_TYPE, CODE) \ + \ +static GType g_define_type_id = 0; \ + \ +GType \ +object_name##_get_type (void) \ +{ \ + return g_define_type_id; \ +} \ + \ +static void object_name##_init (ObjectName *self); \ +static void object_name##_class_init (ObjectName##Class *klass); \ +static gpointer object_name##_parent_class = NULL; \ +static void object_name##_class_intern_init (gpointer klass) \ +{ \ + object_name##_parent_class = g_type_class_peek_parent (klass); \ + object_name##_class_init ((ObjectName##Class *) klass); \ +} \ + \ +GType \ +object_name##_register_type (GTypeModule *type_module) \ +{ \ + GTypeModule *module G_GNUC_UNUSED = type_module; /* back compat */ \ + static const GTypeInfo our_info = \ + { \ + sizeof (ObjectName##Class), \ + NULL, /* base_init */ \ + NULL, /* base_finalize */ \ + (GClassInitFunc) object_name##_class_intern_init, \ + NULL, \ + NULL, /* class_data */ \ + sizeof (ObjectName), \ + 0, /* n_preallocs */ \ + (GInstanceInitFunc) object_name##_init \ + }; \ + \ + g_define_type_id = g_type_module_register_type (type_module, \ + PARENT_TYPE, \ + #ObjectName, \ + &our_info, \ + 0); \ + \ + CODE \ + \ + return g_define_type_id; \ +} + + +/** + * VINAGRE_PLUGIN_DEFINE_TYPE(ObjectName, object_name, PARENT_TYPE): + * + * Utility macro used to register gobject types in plugins. + * + * Deprecated: use G_DEFINE_DYNAMIC instead + */ +#define VINAGRE_PLUGIN_DEFINE_TYPE(ObjectName, object_name, PARENT_TYPE) \ + VINAGRE_PLUGIN_DEFINE_TYPE_WITH_CODE(ObjectName, object_name, PARENT_TYPE, ;) + +/** + * VINAGRE_PLUGIN_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init): + * + * Utility macro used to register interfaces for gobject types in plugins. + */ +#define VINAGRE_PLUGIN_IMPLEMENT_INTERFACE(object_name, TYPE_IFACE, iface_init) \ + const GInterfaceInfo object_name##_interface_info = \ + { \ + (GInterfaceInitFunc) iface_init, \ + NULL, \ + NULL \ + }; \ + \ + g_type_module_add_interface (type_module, \ + g_define_type_id, \ + TYPE_IFACE, \ + &object_name##_interface_info); + +G_END_DECLS + +#endif /* __VINAGRE_PLUGIN_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin-info.c vinagre-2.29.1/vinagre/vinagre-plugin-info.c --- vinagre-2.26.1/vinagre/vinagre-plugin-info.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin-info.c 2009-07-29 18:05:20.000000000 +0100 @@ -0,0 +1,397 @@ +/* + * vinagre-plugin-info.c + * This file is part of vinagre + * + * Based on gedit plugin system + * Copyright (C) 2002-2005 - Paolo Maggi + * Copyright (C) 2007 - Paolo Maggi, Steve Frécinaux + * + * vinagre-plugin-info.c 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. + * + * vinagre-plugin-info.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "vinagre-debug.h" +#include "vinagre-plugin.h" +#include "vinagre-plugin-info.h" +#include "vinagre-plugin-info-priv.h" + +void +_vinagre_plugin_info_ref (VinagrePluginInfo *info) +{ + g_atomic_int_inc (&info->refcount); +} + +static VinagrePluginInfo * +vinagre_plugin_info_copy (VinagrePluginInfo *info) +{ + _vinagre_plugin_info_ref (info); + return info; +} + +void +_vinagre_plugin_info_unref (VinagrePluginInfo *info) +{ + if (!g_atomic_int_dec_and_test (&info->refcount)) + return; + + if (info->plugin != NULL) + { + vinagre_debug_message (DEBUG_PLUGINS, "Unref plugin %s", info->name); + g_object_unref (info->plugin); + } + + g_free (info->file); + g_free (info->module_name); + g_strfreev (info->dependencies); + g_free (info->name); + g_free (info->desc); + g_free (info->icon_name); + g_free (info->website); + g_free (info->copyright); + g_free (info->loader); + g_free (info->version); + g_strfreev (info->authors); + + g_free (info); +} + +/** + * vinagre_plugin_info_get_type: + * + * Retrieves the #GType object which is associated with the #VinagrePluginInfo + * class. + * + * Return value: the GType associated with #VinagrePluginInfo. + **/ +GType +vinagre_plugin_info_get_type (void) +{ + static GType the_type = 0; + + if (G_UNLIKELY (!the_type)) + the_type = g_boxed_type_register_static ("VinagrePluginInfo", + (GBoxedCopyFunc) vinagre_plugin_info_copy, + (GBoxedFreeFunc) _vinagre_plugin_info_unref); + + return the_type; +} + +/** + * vinagre_plugin_info_new: + * @filename: the filename where to read the plugin information + * + * Creates a new #VinagrePluginInfo from a file on the disk. + * + * Return value: a newly created #VinagrePluginInfo. + */ +VinagrePluginInfo * +_vinagre_plugin_info_new (const gchar *file) +{ + VinagrePluginInfo *info; + GKeyFile *plugin_file = NULL; + gchar *str; + + g_return_val_if_fail (file != NULL, NULL); + + vinagre_debug_message (DEBUG_PLUGINS, "Loading plugin: %s", file); + + info = g_new0 (VinagrePluginInfo, 1); + info->refcount = 1; + info->file = g_strdup (file); + + plugin_file = g_key_file_new (); + if (!g_key_file_load_from_file (plugin_file, file, G_KEY_FILE_NONE, NULL)) + { + g_warning ("Bad plugin file: %s", file); + goto error; + } + + if (!g_key_file_has_key (plugin_file, + "Vinagre Plugin", + "IAge", + NULL)) + { + vinagre_debug_message (DEBUG_PLUGINS, + "IAge key does not exist in file: %s", file); + goto error; + } + + /* Check IAge=1 */ + if (g_key_file_get_integer (plugin_file, + "Vinagre Plugin", + "IAge", + NULL) != 1) + { + vinagre_debug_message (DEBUG_PLUGINS, + "Wrong IAge in file: %s", file); + goto error; + } + + /* Get module name */ + str = g_key_file_get_string (plugin_file, + "Vinagre Plugin", + "Module", + NULL); + + if ((str != NULL) && (*str != '\0')) + info->module_name = str; + else + { + g_warning ("Could not find 'Module' in %s", file); + goto error; + } + + /* Get the dependency list */ + info->dependencies = g_key_file_get_string_list (plugin_file, + "Vinagre Plugin", + "Depends", + NULL, + NULL); + if (info->dependencies == NULL) + { + vinagre_debug_message (DEBUG_PLUGINS, "Could not find 'Depends' in %s", file); + info->dependencies = g_new0 (gchar *, 1); + } + + /* Get the loader for this plugin */ + str = g_key_file_get_string (plugin_file, + "Vinagre Plugin", + "Loader", + NULL); + if ((str != NULL) && (*str != '\0')) + info->loader = str; + else + /* default to the C loader */ + info->loader = g_strdup("c"); + + /* Get Name */ + str = g_key_file_get_locale_string (plugin_file, + "Vinagre Plugin", + "Name", + NULL, + NULL); + if (str) + info->name = str; + else + { + g_warning ("Could not find 'Name' in %s", file); + goto error; + } + + /* Get Description */ + str = g_key_file_get_locale_string (plugin_file, + "Vinagre Plugin", + "Description", + NULL, + NULL); + if (str) + info->desc = str; + else + vinagre_debug_message (DEBUG_PLUGINS, "Could not find 'Description' in %s", file); + + /* Get Icon */ + str = g_key_file_get_locale_string (plugin_file, + "Vinagre Plugin", + "Icon", + NULL, + NULL); + if (str) + info->icon_name = str; + else + vinagre_debug_message (DEBUG_PLUGINS, "Could not find 'Icon' in %s, using 'vinagre'", file); + + /* Get Authors */ + info->authors = g_key_file_get_string_list (plugin_file, + "Vinagre Plugin", + "Authors", + NULL, + NULL); + if (info->authors == NULL) + vinagre_debug_message (DEBUG_PLUGINS, "Could not find 'Authors' in %s", file); + + /* Get Copyright */ + str = g_key_file_get_string (plugin_file, + "Vinagre Plugin", + "Copyright", + NULL); + if (str) + info->copyright = str; + else + vinagre_debug_message (DEBUG_PLUGINS, "Could not find 'Copyright' in %s", file); + + /* Get Website */ + str = g_key_file_get_string (plugin_file, + "Vinagre Plugin", + "Website", + NULL); + if (str) + info->website = str; + else + vinagre_debug_message (DEBUG_PLUGINS, "Could not find 'Website' in %s", file); + + /* Get Version */ + str = g_key_file_get_string (plugin_file, + "Vinagre Plugin", + "Version", + NULL); + if (str) + info->version = str; + else + vinagre_debug_message (DEBUG_PLUGINS, "Could not find 'Version' in %s", file); + + /* Check if is engine or normal plugin */ + info->engine = g_key_file_get_boolean (plugin_file, + "Vinagre Plugin", + "Engine", + NULL); + if (str) + info->version = str; + else + vinagre_debug_message (DEBUG_PLUGINS, "Could not find 'Version' in %s", file); + + g_key_file_free (plugin_file); + + /* If we know nothing about the availability of the plugin, + set it as available */ + info->available = TRUE; + + return info; + +error: + g_free (info->file); + g_free (info->module_name); + g_free (info->name); + g_free (info->loader); + g_free (info); + g_key_file_free (plugin_file); + + return NULL; +} + +gboolean +vinagre_plugin_info_is_active (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, FALSE); + + return info->available && info->plugin != NULL; +} + +gboolean +vinagre_plugin_info_is_available (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, FALSE); + + return info->available != FALSE; +} + +gboolean +vinagre_plugin_info_is_configurable (VinagrePluginInfo *info) +{ + vinagre_debug_message (DEBUG_PLUGINS, "Is '%s' configurable?", info->name); + + g_return_val_if_fail (info != NULL, FALSE); + + if (info->plugin == NULL || !info->available) + return FALSE; + + return vinagre_plugin_is_configurable (info->plugin); +} + +const gchar * +vinagre_plugin_info_get_module_name (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + + return info->module_name; +} + +const gchar * +vinagre_plugin_info_get_name (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + + return info->name; +} + +const gchar * +vinagre_plugin_info_get_description (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + + return info->desc; +} + +const gchar * +vinagre_plugin_info_get_icon_name (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + + /* use the vinagre-plugin icon as a default if the plugin does not + have its own */ + if (info->icon_name != NULL && + gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), + info->icon_name)) + return info->icon_name; + else + return "vinagre"; +} + +const gchar ** +vinagre_plugin_info_get_authors (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, (const gchar **)NULL); + + return (const gchar **) info->authors; +} + +const gchar * +vinagre_plugin_info_get_website (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + + return info->website; +} + +const gchar * +vinagre_plugin_info_get_copyright (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + + return info->copyright; +} + +const gchar * +vinagre_plugin_info_get_version (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, NULL); + + return info->version; +} + +gboolean +vinagre_plugin_info_is_engine (VinagrePluginInfo *info) +{ + g_return_val_if_fail (info != NULL, FALSE); + + return info->engine; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin-info.h vinagre-2.29.1/vinagre/vinagre-plugin-info.h --- vinagre-2.26.1/vinagre/vinagre-plugin-info.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin-info.h 2009-07-27 12:59:32.000000000 +0100 @@ -0,0 +1,54 @@ +/* + * vinagre-plugin-info.h + * This file is part of vinagre + * Based on gedit plugin system + * Copyright (C) 2002-2005 - Paolo Maggi + * Copyright (C) 2007 - Paolo Maggi, Steve Frécinaux + * + * vinagre-plugin-info.h 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. + * + * vinagre-plugin-info.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_PLUGIN_INFO_H__ +#define __VINAGRE_PLUGIN_INFO_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_PLUGIN_INFO (vinagre_plugin_info_get_type ()) +#define VINAGRE_PLUGIN_INFO(obj) ((VinagrePluginInfo *) (obj)) + +typedef struct _VinagrePluginInfo VinagrePluginInfo; + +GType vinagre_plugin_info_get_type (void) G_GNUC_CONST; + +gboolean vinagre_plugin_info_is_active (VinagrePluginInfo *info); +gboolean vinagre_plugin_info_is_available (VinagrePluginInfo *info); +gboolean vinagre_plugin_info_is_configurable (VinagrePluginInfo *info); + +const gchar *vinagre_plugin_info_get_module_name (VinagrePluginInfo *info); + +const gchar *vinagre_plugin_info_get_name (VinagrePluginInfo *info); +const gchar *vinagre_plugin_info_get_description (VinagrePluginInfo *info); +const gchar *vinagre_plugin_info_get_icon_name (VinagrePluginInfo *info); +const gchar **vinagre_plugin_info_get_authors (VinagrePluginInfo *info); +const gchar *vinagre_plugin_info_get_website (VinagrePluginInfo *info); +const gchar *vinagre_plugin_info_get_copyright (VinagrePluginInfo *info); +const gchar *vinagre_plugin_info_get_version (VinagrePluginInfo *info); +gboolean vinagre_plugin_info_is_engine (VinagrePluginInfo *info); + +G_END_DECLS + +#endif /* __VINAGRE_PLUGIN_INFO_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin-info-priv.h vinagre-2.29.1/vinagre/vinagre-plugin-info-priv.h --- vinagre-2.26.1/vinagre/vinagre-plugin-info-priv.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin-info-priv.h 2009-07-27 12:59:32.000000000 +0100 @@ -0,0 +1,60 @@ +/* + * vinagre-plugin-info-priv.h + * This file is part of vinagre + * + * Based on gedit plugin system + * Copyright (C) 2002-2005 - Paolo Maggi + * Copyright (C) 2007 - Paolo Maggi, Steve Frécinaux + * + * vinagre-plugin-info-priv.h 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. + * + * vinagre-plugin-info-priv.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_PLUGIN_INFO_PRIV_H__ +#define __VINAGRE_PLUGIN_INFO_PRIV_H__ + +#include "vinagre-plugin-info.h" +#include "vinagre-plugin.h" + +struct _VinagrePluginInfo +{ + gint refcount; + + VinagrePlugin *plugin; + gchar *file; + + gchar *module_name; + gchar *loader; + gchar **dependencies; + + gchar *name; + gchar *desc; + gchar *icon_name; + gchar **authors; + gchar *copyright; + gchar *website; + gchar *version; + + /* A plugin is unavailable if it is not possible to activate it + due to an error loading the plugin module (e.g. for Python plugins + when the interpreter has not been correctly initializated) */ + gint available : 1; + gint engine : 1; +}; + +VinagrePluginInfo *_vinagre_plugin_info_new (const gchar *file); +void _vinagre_plugin_info_ref (VinagrePluginInfo *info); +void _vinagre_plugin_info_unref (VinagrePluginInfo *info); + +#endif /* __VINAGRE_PLUGIN_INFO_PRIV_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin-loader.c vinagre-2.29.1/vinagre/vinagre-plugin-loader.c --- vinagre-2.26.1/vinagre/vinagre-plugin-loader.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin-loader.c 2009-07-27 12:59:32.000000000 +0100 @@ -0,0 +1,132 @@ +/* + * vinagre-plugin-loader.c + * This file is part of vinagre + * + * Based on gedit plugin system + * Copyright (C) 2008 - Jesse van den Kieboom + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "vinagre-plugin-loader.h" + +static void +vinagre_plugin_loader_base_init (gpointer g_class) +{ + static gboolean initialized = FALSE; + + if (G_UNLIKELY (!initialized)) + { + /* create interface signals here. */ + initialized = TRUE; + } +} + +GType +vinagre_plugin_loader_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) + { + static const GTypeInfo info = + { + sizeof (VinagrePluginLoaderInterface), + vinagre_plugin_loader_base_init, /* base_init */ + NULL, /* base_finalize */ + NULL, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + 0, + 0, /* n_preallocs */ + NULL /* instance_init */ + }; + + type = g_type_register_static (G_TYPE_INTERFACE, "VinagrePluginLoader", &info, 0); + } + + return type; +} + +const gchar * +vinagre_plugin_loader_type_get_id (GType type) +{ + GTypeClass *klass; + VinagrePluginLoaderInterface *iface; + + klass = g_type_class_ref (type); + + if (klass == NULL) + { + g_warning ("Could not get class info for plugin loader"); + return NULL; + } + + iface = g_type_interface_peek (klass, VINAGRE_TYPE_PLUGIN_LOADER); + + if (iface == NULL) + { + g_warning ("Could not get plugin loader interface"); + g_type_class_unref (klass); + + return NULL; + } + + g_return_val_if_fail (iface->get_id != NULL, NULL); + return iface->get_id (); +} + +VinagrePlugin * +vinagre_plugin_loader_load (VinagrePluginLoader *loader, + VinagrePluginInfo *info, + const gchar *path) +{ + VinagrePluginLoaderInterface *iface; + + g_return_val_if_fail (VINAGRE_IS_PLUGIN_LOADER (loader), NULL); + + iface = VINAGRE_PLUGIN_LOADER_GET_INTERFACE (loader); + g_return_val_if_fail (iface->load != NULL, NULL); + + return iface->load (loader, info, path); +} + +void +vinagre_plugin_loader_unload (VinagrePluginLoader *loader, + VinagrePluginInfo *info) +{ + VinagrePluginLoaderInterface *iface; + + g_return_if_fail (VINAGRE_IS_PLUGIN_LOADER (loader)); + + iface = VINAGRE_PLUGIN_LOADER_GET_INTERFACE (loader); + g_return_if_fail (iface->unload != NULL); + + iface->unload (loader, info); +} + +void +vinagre_plugin_loader_garbage_collect (VinagrePluginLoader *loader) +{ + VinagrePluginLoaderInterface *iface; + + g_return_if_fail (VINAGRE_IS_PLUGIN_LOADER (loader)); + + iface = VINAGRE_PLUGIN_LOADER_GET_INTERFACE (loader); + + if (iface->garbage_collect != NULL) + iface->garbage_collect (loader); +} diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin-loader.h vinagre-2.29.1/vinagre/vinagre-plugin-loader.h --- vinagre-2.26.1/vinagre/vinagre-plugin-loader.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin-loader.h 2009-07-28 15:48:34.000000000 +0100 @@ -0,0 +1,107 @@ +/* + * vinagre-plugin-loader.h + * This file is part of vinagre + * + * Based on gedit plugin system + * Copyright (C) 2008 - Jesse van den Kieboom + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __VINAGRE_PLUGIN_LOADER_H__ +#define __VINAGRE_PLUGIN_LOADER_H__ + +#include +#include "vinagre-plugin.h" +#include "vinagre-plugin-info.h" + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_PLUGIN_LOADER (vinagre_plugin_loader_get_type ()) +#define VINAGRE_PLUGIN_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_PLUGIN_LOADER, VinagrePluginLoader)) +#define VINAGRE_IS_PLUGIN_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_PLUGIN_LOADER)) +#define VINAGRE_PLUGIN_LOADER_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), VINAGRE_TYPE_PLUGIN_LOADER, VinagrePluginLoaderInterface)) + +typedef struct _VinagrePluginLoader VinagrePluginLoader; /* dummy object */ +typedef struct _VinagrePluginLoaderInterface VinagrePluginLoaderInterface; + +struct _VinagrePluginLoaderInterface { + GTypeInterface parent; + + const gchar *(*get_id) (void); + + VinagrePlugin *(*load) (VinagrePluginLoader *loader, + VinagrePluginInfo *info, + const gchar *path); + + void (*unload) (VinagrePluginLoader *loader, + VinagrePluginInfo *info); + + void (*garbage_collect) (VinagrePluginLoader *loader); +}; + +GType vinagre_plugin_loader_get_type (void); + +const gchar *vinagre_plugin_loader_type_get_id (GType type); +VinagrePlugin *vinagre_plugin_loader_load (VinagrePluginLoader *loader, + VinagrePluginInfo *info, + const gchar *path); +void vinagre_plugin_loader_unload (VinagrePluginLoader *loader, + VinagrePluginInfo *info); +void vinagre_plugin_loader_garbage_collect (VinagrePluginLoader *loader); + +/** + * VINAGRE_PLUGIN_LOADER_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init): + * + * Utility macro used to register interfaces for gobject types in plugin loaders. + */ +#define VINAGRE_PLUGIN_LOADER_IMPLEMENT_INTERFACE(TYPE_IFACE, iface_init) \ + const GInterfaceInfo g_implement_interface_info = \ + { \ + (GInterfaceInitFunc) iface_init, \ + NULL, \ + NULL \ + }; \ + \ + g_type_module_add_interface (type_module, \ + g_define_type_id, \ + TYPE_IFACE, \ + &g_implement_interface_info); + +/** + * VINAGRE_PLUGIN_LOADER_REGISTER_TYPE(PluginLoaderName, plugin_loader_name, PARENT_TYPE, loader_interface_init): + * + * Utility macro used to register plugin loaders. + */ +#define VINAGRE_PLUGIN_LOADER_REGISTER_TYPE(PluginLoaderName, plugin_loader_name, PARENT_TYPE, loader_iface_init) \ + G_DEFINE_DYNAMIC_TYPE_EXTENDED (PluginLoaderName, \ + plugin_loader_name, \ + PARENT_TYPE, \ + 0, \ + VINAGRE_PLUGIN_LOADER_IMPLEMENT_INTERFACE(VINAGRE_TYPE_PLUGIN_LOADER, loader_iface_init)); \ + \ + \ +G_MODULE_EXPORT GType \ +register_vinagre_plugin_loader (GTypeModule *type_module) \ +{ \ + plugin_loader_name##_register_type (type_module); \ + \ + return plugin_loader_name##_get_type(); \ +} + +G_END_DECLS + +#endif /* __VINAGRE_PLUGIN_LOADER_H__ */ diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin-manager.c vinagre-2.29.1/vinagre/vinagre-plugin-manager.c --- vinagre-2.26.1/vinagre/vinagre-plugin-manager.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin-manager.c 2009-07-27 12:59:32.000000000 +0100 @@ -0,0 +1,888 @@ +/* + * vinagre-plugins-manager.c + * This file is part of vinagre + * + * Based on gedit plugin system + * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2009 Jorge Pereira + * + * vinagre-plugins-manager.c 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. + * + * vinagre-plugins-manager.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#include + +#include "vinagre-plugin-manager.h" +#include "vinagre-utils.h" +#include "vinagre-plugins-engine.h" +#include "vinagre-plugin.h" +#include "vinagre-debug.h" + +enum +{ + ACTIVE_COLUMN, + AVAILABLE_COLUMN, + INFO_COLUMN, + N_COLUMNS +}; + +#define PLUGIN_MANAGER_NAME_TITLE _("Plugin") +#define PLUGIN_MANAGER_ACTIVE_TITLE _("Enabled") + +#define VINAGRE_PLUGIN_MANAGER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_PLUGIN_MANAGER, VinagrePluginManagerPrivate)) + +struct _VinagrePluginManagerPrivate +{ + GtkWidget *tree; + + GtkWidget *about_button; + GtkWidget *configure_button; + + VinagrePluginsEngine *engine; + + GtkWidget *about; + + GtkWidget *popup_menu; +}; + +G_DEFINE_TYPE(VinagrePluginManager, vinagre_plugin_manager, GTK_TYPE_VBOX) + +static VinagrePluginInfo *plugin_manager_get_selected_plugin (VinagrePluginManager *pm); +static void plugin_manager_toggle_active (VinagrePluginManager *pm, GtkTreeIter *iter, GtkTreeModel *model); +static void vinagre_plugin_manager_finalize (GObject *object); + +static void +vinagre_plugin_manager_class_init (VinagrePluginManagerClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = vinagre_plugin_manager_finalize; + + g_type_class_add_private (object_class, sizeof (VinagrePluginManagerPrivate)); +} + +static void +about_button_cb (GtkWidget *button, + VinagrePluginManager *pm) +{ + VinagrePluginInfo *info; + + vinagre_debug (DEBUG_PLUGINS); + + info = plugin_manager_get_selected_plugin (pm); + + g_return_if_fail (info != NULL); + + /* if there is another about dialog already open destroy it */ + if (pm->priv->about) + gtk_widget_destroy (pm->priv->about); + + pm->priv->about = g_object_new (GTK_TYPE_ABOUT_DIALOG, + "program-name", vinagre_plugin_info_get_name (info), + "copyright", vinagre_plugin_info_get_copyright (info), + "authors", vinagre_plugin_info_get_authors (info), + "comments", vinagre_plugin_info_get_description (info), + "website", vinagre_plugin_info_get_website (info), + "logo-icon-name", vinagre_plugin_info_get_icon_name (info), + "version", vinagre_plugin_info_get_version (info), + NULL); + + gtk_window_set_destroy_with_parent (GTK_WINDOW (pm->priv->about), + TRUE); + + g_signal_connect (pm->priv->about, + "response", + G_CALLBACK (gtk_widget_destroy), + NULL); + g_signal_connect (pm->priv->about, + "destroy", + G_CALLBACK (gtk_widget_destroyed), + &pm->priv->about); + + gtk_window_set_transient_for (GTK_WINDOW (pm->priv->about), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET(pm)))); + gtk_widget_show (pm->priv->about); +} + +static void +configure_button_cb (GtkWidget *button, + VinagrePluginManager *pm) +{ + VinagrePluginInfo *info; + GtkWindow *toplevel; + + vinagre_debug (DEBUG_PLUGINS); + + info = plugin_manager_get_selected_plugin (pm); + + g_return_if_fail (info != NULL); + + vinagre_debug_message (DEBUG_PLUGINS, "Configuring: %s\n", + vinagre_plugin_info_get_name (info)); + + toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET(pm))); + + vinagre_plugins_engine_configure_plugin (pm->priv->engine, + info, toplevel); + + vinagre_debug_message (DEBUG_PLUGINS, "Done"); +} + +static void +plugin_manager_view_info_cell_cb (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + VinagrePluginInfo *info; + gchar *text; + + g_return_if_fail (tree_model != NULL); + g_return_if_fail (tree_column != NULL); + + gtk_tree_model_get (tree_model, iter, INFO_COLUMN, &info, -1); + + if (info == NULL) + return; + + text = g_markup_printf_escaped ("%s\n%s", + vinagre_plugin_info_get_name (info), + vinagre_plugin_info_get_description (info)); + g_object_set (G_OBJECT (cell), + "markup", text, + "sensitive", vinagre_plugin_info_is_available (info), + NULL); + + g_free (text); +} + +static void +plugin_manager_view_icon_cell_cb (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + VinagrePluginInfo *info; + + g_return_if_fail (tree_model != NULL); + g_return_if_fail (tree_column != NULL); + + gtk_tree_model_get (tree_model, iter, INFO_COLUMN, &info, -1); + + if (info == NULL) + return; + + g_object_set (G_OBJECT (cell), + "icon-name", vinagre_plugin_info_get_icon_name (info), + "sensitive", vinagre_plugin_info_is_available (info), + NULL); +} + + +static void +active_toggled_cb (GtkCellRendererToggle *cell, + gchar *path_str, + VinagrePluginManager *pm) +{ + GtkTreeIter iter; + GtkTreePath *path; + GtkTreeModel *model; + + vinagre_debug (DEBUG_PLUGINS); + + path = gtk_tree_path_new_from_string (path_str); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (pm->priv->tree)); + g_return_if_fail (model != NULL); + + gtk_tree_model_get_iter (model, &iter, path); + + if (&iter != NULL) + plugin_manager_toggle_active (pm, &iter, model); + + gtk_tree_path_free (path); +} + +static void +cursor_changed_cb (GtkTreeView *view, + gpointer data) +{ + VinagrePluginManager *pm = data; + VinagrePluginInfo *info; + + vinagre_debug (DEBUG_PLUGINS); + + info = plugin_manager_get_selected_plugin (pm); + + gtk_widget_set_sensitive (GTK_WIDGET (pm->priv->about_button), + info != NULL); + gtk_widget_set_sensitive (GTK_WIDGET (pm->priv->configure_button), + (info != NULL) && + vinagre_plugin_info_is_configurable (info)); +} + +static void +row_activated_cb (GtkTreeView *tree_view, + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer data) +{ + VinagrePluginManager *pm = data; + GtkTreeIter iter; + GtkTreeModel *model; + + vinagre_debug (DEBUG_PLUGINS); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (pm->priv->tree)); + + g_return_if_fail (model != NULL); + + gtk_tree_model_get_iter (model, &iter, path); + + g_return_if_fail (&iter != NULL); + + plugin_manager_toggle_active (pm, &iter, model); +} + +static void +plugin_manager_populate_lists (VinagrePluginManager *pm) +{ + const GSList *plugins; + GtkListStore *model; + GtkTreeIter iter; + + vinagre_debug (DEBUG_PLUGINS); + + plugins = vinagre_plugins_engine_get_plugin_list (pm->priv->engine); + + model = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (pm->priv->tree))); + + while (plugins) + { + VinagrePluginInfo *info; + info = (VinagrePluginInfo *)plugins->data; + + gtk_list_store_append (model, &iter); + gtk_list_store_set (model, &iter, + ACTIVE_COLUMN, vinagre_plugin_info_is_active (info), + AVAILABLE_COLUMN, vinagre_plugin_info_is_available (info), + INFO_COLUMN, info, + -1); + + plugins = plugins->next; + } + + if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter)) + { + GtkTreeSelection *selection; + VinagrePluginInfo* info; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (pm->priv->tree)); + g_return_if_fail (selection != NULL); + + gtk_tree_selection_select_iter (selection, &iter); + + gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, + INFO_COLUMN, &info, -1); + + gtk_widget_set_sensitive (GTK_WIDGET (pm->priv->configure_button), + vinagre_plugin_info_is_configurable (info)); + } +} + +static gboolean +plugin_manager_set_active (VinagrePluginManager *pm, + GtkTreeIter *iter, + GtkTreeModel *model, + gboolean active) +{ + VinagrePluginInfo *info; + gboolean res = TRUE; + + vinagre_debug (DEBUG_PLUGINS); + + gtk_tree_model_get (model, iter, INFO_COLUMN, &info, -1); + + g_return_val_if_fail (info != NULL, FALSE); + + if (active) + { + /* activate the plugin */ + if (!vinagre_plugins_engine_activate_plugin (pm->priv->engine, info)) { + vinagre_debug_message (DEBUG_PLUGINS, "Could not activate %s.\n", + vinagre_plugin_info_get_name (info)); + + res = FALSE; + } + } + else + { + /* deactivate the plugin */ + if (!vinagre_plugins_engine_deactivate_plugin (pm->priv->engine, info)) { + vinagre_debug_message (DEBUG_PLUGINS, "Could not deactivate %s.\n", + vinagre_plugin_info_get_name (info)); + + res = FALSE; + } + } + + return res; +} + +static void +plugin_manager_toggle_active (VinagrePluginManager *pm, + GtkTreeIter *iter, + GtkTreeModel *model) +{ + gboolean active; + + vinagre_debug (DEBUG_PLUGINS); + + gtk_tree_model_get (model, iter, ACTIVE_COLUMN, &active, -1); + + active ^= 1; + + plugin_manager_set_active (pm, iter, model, active); +} + +static VinagrePluginInfo * +plugin_manager_get_selected_plugin (VinagrePluginManager *pm) +{ + VinagrePluginInfo *info = NULL; + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreeSelection *selection; + + vinagre_debug (DEBUG_PLUGINS); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (pm->priv->tree)); + g_return_val_if_fail (model != NULL, NULL); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (pm->priv->tree)); + g_return_val_if_fail (selection != NULL, NULL); + + if (gtk_tree_selection_get_selected (selection, NULL, &iter)) + { + gtk_tree_model_get (model, &iter, INFO_COLUMN, &info, -1); + } + + return info; +} + +static void +plugin_manager_set_active_all (VinagrePluginManager *pm, + gboolean active) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + vinagre_debug (DEBUG_PLUGINS); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (pm->priv->tree)); + + g_return_if_fail (model != NULL); + + gtk_tree_model_get_iter_first (model, &iter); + + do { + plugin_manager_set_active (pm, &iter, model, active); + } + while (gtk_tree_model_iter_next (model, &iter)); +} + +/* Callback used as the interactive search comparison function */ +static gboolean +name_search_cb (GtkTreeModel *model, + gint column, + const gchar *key, + GtkTreeIter *iter, + gpointer data) +{ + VinagrePluginInfo *info; + gchar *normalized_string; + gchar *normalized_key; + gchar *case_normalized_string; + gchar *case_normalized_key; + gint key_len; + gboolean retval; + + gtk_tree_model_get (model, iter, INFO_COLUMN, &info, -1); + if (!info) + return FALSE; + + normalized_string = g_utf8_normalize (vinagre_plugin_info_get_name (info), -1, G_NORMALIZE_ALL); + normalized_key = g_utf8_normalize (key, -1, G_NORMALIZE_ALL); + case_normalized_string = g_utf8_casefold (normalized_string, -1); + case_normalized_key = g_utf8_casefold (normalized_key, -1); + + key_len = strlen (case_normalized_key); + + /* Oddly enough, this callback must return whether to stop the search + * because we found a match, not whether we actually matched. + */ + retval = (strncmp (case_normalized_key, case_normalized_string, key_len) != 0); + + g_free (normalized_key); + g_free (normalized_string); + g_free (case_normalized_key); + g_free (case_normalized_string); + + return retval; +} + +static void +enable_plugin_menu_cb (GtkMenu *menu, + VinagrePluginManager *pm) +{ + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreeSelection *selection; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (pm->priv->tree)); + g_return_if_fail (model != NULL); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (pm->priv->tree)); + g_return_if_fail (selection != NULL); + + if (gtk_tree_selection_get_selected (selection, NULL, &iter)) + plugin_manager_toggle_active (pm, &iter, model); +} + +static void +enable_all_menu_cb (GtkMenu *menu, + VinagrePluginManager *pm) +{ + plugin_manager_set_active_all (pm, TRUE); +} + +static void +disable_all_menu_cb (GtkMenu *menu, + VinagrePluginManager *pm) +{ + plugin_manager_set_active_all (pm, FALSE); +} + +static GtkWidget * +create_tree_popup_menu (VinagrePluginManager *pm) +{ + GtkWidget *menu; + GtkWidget *item; + GtkWidget *image; + VinagrePluginInfo *info; + + info = plugin_manager_get_selected_plugin (pm); + + menu = gtk_menu_new (); + + item = gtk_image_menu_item_new_with_mnemonic (_("_About")); + image = gtk_image_new_from_stock (GTK_STOCK_ABOUT, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + g_signal_connect (item, "activate", + G_CALLBACK (about_button_cb), pm); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + item = gtk_image_menu_item_new_with_mnemonic (_("C_onfigure")); + image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + g_signal_connect (item, "activate", + G_CALLBACK (configure_button_cb), pm); + gtk_widget_set_sensitive (item, vinagre_plugin_info_is_configurable (info)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + item = gtk_check_menu_item_new_with_mnemonic (_("A_ctivate")); + gtk_widget_set_sensitive (item, vinagre_plugin_info_is_available (info)); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), + vinagre_plugin_info_is_active (info)); + g_signal_connect (item, "toggled", + G_CALLBACK (enable_plugin_menu_cb), pm); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + item = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + item = gtk_menu_item_new_with_mnemonic (_("Ac_tivate All")); + g_signal_connect (item, "activate", + G_CALLBACK (enable_all_menu_cb), pm); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + item = gtk_menu_item_new_with_mnemonic (_("_Deactivate All")); + g_signal_connect (item, "activate", + G_CALLBACK (disable_all_menu_cb), pm); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + + gtk_widget_show_all (menu); + + return menu; +} + +static void +tree_popup_menu_detach (VinagrePluginManager *pm, + GtkMenu *menu) +{ + pm->priv->popup_menu = NULL; +} + +static void +show_tree_popup_menu (GtkTreeView *tree, + VinagrePluginManager *pm, + GdkEventButton *event) +{ + if (pm->priv->popup_menu) + gtk_widget_destroy (pm->priv->popup_menu); + + pm->priv->popup_menu = create_tree_popup_menu (pm); + + gtk_menu_attach_to_widget (GTK_MENU (pm->priv->popup_menu), + GTK_WIDGET (pm), + (GtkMenuDetachFunc) tree_popup_menu_detach); + + if (event != NULL) + { + gtk_menu_popup (GTK_MENU (pm->priv->popup_menu), NULL, NULL, + NULL, NULL, + event->button, event->time); + } + else + {/*AQUI + gtk_menu_popup (GTK_MENU (pm->priv->popup_menu), NULL, NULL, + vinagre_utils_menu_position_under_tree_view, tree, + 0, gtk_get_current_event_time ()); +*/ + gtk_menu_shell_select_first (GTK_MENU_SHELL (pm->priv->popup_menu), + FALSE); + } +} + +static gboolean +button_press_event_cb (GtkWidget *tree, + GdkEventButton *event, + VinagrePluginManager *pm) +{ + /* We want the treeview selection to be updated before showing the menu. + * This code is evil, thanks to Federico Mena Quintero's black magic. + * See: http://mail.gnome.org/archives/gtk-devel-list/2006-February/msg00168.html + * FIXME: Let's remove it asap. + */ + + static gboolean in_press = FALSE; + gboolean handled; + + if (in_press) + return FALSE; /* we re-entered */ + + if (GDK_BUTTON_PRESS != event->type || 3 != event->button) + return FALSE; /* let the normal handler run */ + + in_press = TRUE; + handled = gtk_widget_event (tree, (GdkEvent *) event); + in_press = FALSE; + + if (!handled) + return FALSE; + + /* The selection is fully updated by now */ + show_tree_popup_menu (GTK_TREE_VIEW (tree), pm, event); + return TRUE; +} + +static gboolean +popup_menu_cb (GtkTreeView *tree, + VinagrePluginManager *pm) +{ + show_tree_popup_menu (tree, pm, NULL); + return TRUE; +} + +static gint +model_name_sort_func (GtkTreeModel *model, + GtkTreeIter *iter1, + GtkTreeIter *iter2, + gpointer user_data) +{ + VinagrePluginInfo *info1, *info2; + + gtk_tree_model_get (model, iter1, INFO_COLUMN, &info1, -1); + gtk_tree_model_get (model, iter2, INFO_COLUMN, &info2, -1); + + return g_utf8_collate (vinagre_plugin_info_get_name (info1), + vinagre_plugin_info_get_name (info2)); +} + +static void +plugin_manager_construct_tree (VinagrePluginManager *pm) +{ + GtkTreeViewColumn *column; + GtkCellRenderer *cell; + GtkListStore *model; + + vinagre_debug (DEBUG_PLUGINS); + + model = gtk_list_store_new (N_COLUMNS, + G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN, + G_TYPE_POINTER); + + gtk_tree_view_set_model (GTK_TREE_VIEW (pm->priv->tree), + GTK_TREE_MODEL (model)); + g_object_unref (model); + + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (pm->priv->tree), TRUE); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (pm->priv->tree), FALSE); + + /* first column */ + cell = gtk_cell_renderer_toggle_new (); + g_object_set (cell, "xpad", 6, NULL); + g_signal_connect (cell, + "toggled", + G_CALLBACK (active_toggled_cb), + pm); + column = gtk_tree_view_column_new_with_attributes (PLUGIN_MANAGER_ACTIVE_TITLE, + cell, + "active", + ACTIVE_COLUMN, + "activatable", + AVAILABLE_COLUMN, + "sensitive", + AVAILABLE_COLUMN, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (pm->priv->tree), column); + + /* second column */ + column = gtk_tree_view_column_new (); + gtk_tree_view_column_set_title (column, PLUGIN_MANAGER_NAME_TITLE); + gtk_tree_view_column_set_resizable (column, TRUE); + + cell = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, cell, FALSE); + g_object_set (cell, "stock-size", GTK_ICON_SIZE_SMALL_TOOLBAR, NULL); + gtk_tree_view_column_set_cell_data_func (column, cell, + plugin_manager_view_icon_cell_cb, + pm, NULL); + + cell = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, cell, TRUE); + g_object_set (cell, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + gtk_tree_view_column_set_cell_data_func (column, cell, + plugin_manager_view_info_cell_cb, + pm, NULL); + + + gtk_tree_view_column_set_spacing (column, 6); + gtk_tree_view_append_column (GTK_TREE_VIEW (pm->priv->tree), column); + + /* Sort on the plugin names */ + gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (model), + model_name_sort_func, + NULL, + NULL); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), + GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, + GTK_SORT_ASCENDING); + + /* Enable search for our non-string column */ + gtk_tree_view_set_search_column (GTK_TREE_VIEW (pm->priv->tree), + INFO_COLUMN); + gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (pm->priv->tree), + name_search_cb, + NULL, + NULL); + + g_signal_connect (pm->priv->tree, + "cursor_changed", + G_CALLBACK (cursor_changed_cb), + pm); + g_signal_connect (pm->priv->tree, + "row_activated", + G_CALLBACK (row_activated_cb), + pm); + + g_signal_connect (pm->priv->tree, + "button-press-event", + G_CALLBACK (button_press_event_cb), + pm); + g_signal_connect (pm->priv->tree, + "popup-menu", + G_CALLBACK (popup_menu_cb), + pm); + gtk_widget_show (pm->priv->tree); +} + +static void +plugin_toggled_cb (VinagrePluginsEngine *engine, + VinagrePluginInfo *info, + VinagrePluginManager *pm) +{ + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean info_found = FALSE; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (pm->priv->tree)); + + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + /* There is an item selected: it's probably the one we want! */ + VinagrePluginInfo *tinfo; + gtk_tree_model_get (model, &iter, INFO_COLUMN, &tinfo, -1); + info_found = info == tinfo; + } + + if (!info_found) + { + gtk_tree_model_get_iter_first (model, &iter); + + do + { + VinagrePluginInfo *tinfo; + gtk_tree_model_get (model, &iter, INFO_COLUMN, &tinfo, -1); + info_found = info == tinfo; + } + while (!info_found && gtk_tree_model_iter_next (model, &iter)); + } + + if (!info_found) + { + g_warning ("VinagrePluginManager: plugin '%s' not found in the tree model", + vinagre_plugin_info_get_name (info)); + return; + } + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, ACTIVE_COLUMN, vinagre_plugin_info_is_active (info), -1); +} + +static void +vinagre_plugin_manager_init (VinagrePluginManager *pm) +{ + GtkWidget *label; + GtkWidget *alignment; + GtkWidget *viewport; + GtkWidget *hbuttonbox; + gchar *markup; + + vinagre_debug (DEBUG_PLUGINS); + + pm->priv = VINAGRE_PLUGIN_MANAGER_GET_PRIVATE (pm); + + /* + * Always we create the manager, firstly we rescan the plugins directory + */ + vinagre_plugins_engine_rescan_plugins (vinagre_plugins_engine_get_default ()); + + gtk_box_set_spacing (GTK_BOX (pm), 6); + + label = gtk_label_new (NULL); + markup = g_markup_printf_escaped ("%s", + _("Active plugins")); + gtk_label_set_markup (GTK_LABEL (label), markup); + g_free (markup); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + + gtk_box_pack_start (GTK_BOX (pm), label, FALSE, TRUE, 0); + + alignment = gtk_alignment_new (0., 0., 1., 1.); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); + gtk_box_pack_start (GTK_BOX (pm), alignment, TRUE, TRUE, 0); + + viewport = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (viewport), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (viewport), + GTK_SHADOW_IN); + + gtk_container_add (GTK_CONTAINER (alignment), viewport); + + pm->priv->tree = gtk_tree_view_new (); + gtk_container_add (GTK_CONTAINER (viewport), pm->priv->tree); + + hbuttonbox = gtk_hbutton_box_new (); + gtk_box_pack_start (GTK_BOX (pm), hbuttonbox, FALSE, FALSE, 0); + gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END); + gtk_box_set_spacing (GTK_BOX (hbuttonbox), 8); + + pm->priv->about_button = vinagre_gtk_button_new_with_stock_icon (_("_About Plugin"), + GTK_STOCK_ABOUT); + gtk_container_add (GTK_CONTAINER (hbuttonbox), pm->priv->about_button); + + pm->priv->configure_button = vinagre_gtk_button_new_with_stock_icon (_("C_onfigure Plugin"), + GTK_STOCK_PREFERENCES); + gtk_container_add (GTK_CONTAINER (hbuttonbox), pm->priv->configure_button); + + /* setup a window of a sane size. */ + gtk_widget_set_size_request (GTK_WIDGET (viewport), 270, 100); + + g_signal_connect (pm->priv->about_button, + "clicked", + G_CALLBACK (about_button_cb), + pm); + g_signal_connect (pm->priv->configure_button, + "clicked", + G_CALLBACK (configure_button_cb), + pm); + + plugin_manager_construct_tree (pm); + + /* get the plugin engine and populate the treeview */ + pm->priv->engine = vinagre_plugins_engine_get_default (); + + g_signal_connect_after (pm->priv->engine, + "activate-plugin", + G_CALLBACK (plugin_toggled_cb), + pm); + g_signal_connect_after (pm->priv->engine, + "deactivate-plugin", + G_CALLBACK (plugin_toggled_cb), + pm); + + if (vinagre_plugins_engine_get_plugin_list (pm->priv->engine) != NULL) + { + plugin_manager_populate_lists (pm); + } + else + { + gtk_widget_set_sensitive (pm->priv->about_button, FALSE); + gtk_widget_set_sensitive (pm->priv->configure_button, FALSE); + } +} + +static void +vinagre_plugin_manager_finalize (GObject *object) +{ + VinagrePluginManager *pm = VINAGRE_PLUGIN_MANAGER (object); + + g_signal_handlers_disconnect_by_func (pm->priv->engine, + plugin_toggled_cb, + pm); + + if (pm->priv->popup_menu) + gtk_widget_destroy (pm->priv->popup_menu); + + G_OBJECT_CLASS (vinagre_plugin_manager_parent_class)->finalize (object); + +} + +GtkWidget *vinagre_plugin_manager_new (void) +{ + return g_object_new (VINAGRE_TYPE_PLUGIN_MANAGER,0); +} diff -Nru vinagre-2.26.1/vinagre/vinagre-plugin-manager.h vinagre-2.29.1/vinagre/vinagre-plugin-manager.h --- vinagre-2.26.1/vinagre/vinagre-plugin-manager.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugin-manager.h 2009-07-27 12:59:32.000000000 +0100 @@ -0,0 +1,75 @@ +/* + * vinagre-plugins-manager.h + * This file is part of vinagre + * + * Based on gedit plugin system + * Copyright (C) 2002-2005 Paolo Maggi + * + * vinagre-plugins-manager.h 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. + * + * vinagre-plugins-manager.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_PLUGIN_MANAGER_H__ +#define __VINAGRE_PLUGIN_MANAGER_H__ + +#include + +G_BEGIN_DECLS + +/* + * Type checking and casting macros + */ +#define VINAGRE_TYPE_PLUGIN_MANAGER (vinagre_plugin_manager_get_type()) +#define VINAGRE_PLUGIN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_PLUGIN_MANAGER, VinagrePluginManager)) +#define VINAGRE_PLUGIN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_PLUGIN_MANAGER, VinagrePluginManagerClass)) +#define VINAGRE_IS_PLUGIN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_PLUGIN_MANAGER)) +#define VINAGRE_IS_PLUGIN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_PLUGIN_MANAGER)) +#define VINAGRE_PLUGIN_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_PLUGIN_MANAGER, VinagrePluginManagerClass)) + +/* Private structure type */ +typedef struct _VinagrePluginManagerPrivate VinagrePluginManagerPrivate; + +/* + * Main object structure + */ +typedef struct _VinagrePluginManager VinagrePluginManager; + +struct _VinagrePluginManager +{ + GtkVBox vbox; + + /*< private > */ + VinagrePluginManagerPrivate *priv; +}; + +/* + * Class definition + */ +typedef struct _VinagrePluginManagerClass VinagrePluginManagerClass; + +struct _VinagrePluginManagerClass +{ + GtkVBoxClass parent_class; +}; + +/* + * Public methods + */ +GType vinagre_plugin_manager_get_type (void) G_GNUC_CONST; + +GtkWidget *vinagre_plugin_manager_new (void); + +G_END_DECLS + +#endif /* __VINAGRE_PLUGIN_MANAGER_H__ */ + diff -Nru vinagre-2.26.1/vinagre/vinagre-plugins-engine.c vinagre-2.29.1/vinagre/vinagre-plugins-engine.c --- vinagre-2.26.1/vinagre/vinagre-plugins-engine.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugins-engine.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,925 @@ +/* + * vinagre-plugins-engine.c + * This file is part of vinagre + * + * Based on gedit plugin system + * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2009 Jonh Wendell s + * + * vinagre-plugins-engine.c 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. + * + * vinagre-plugins-engine.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include "vinagre-plugins-engine.h" +#include "vinagre-plugin-info-priv.h" +#include "vinagre-plugin.h" +#include "vinagre-debug.h" +#include "vinagre-app.h" +#include "vinagre-prefs.h" +#include "vinagre-plugin-loader.h" +#include "vinagre-object-module.h" +#include "vinagre-dirs.h" + +#define VINAGRE_PLUGINS_ENGINE_BASE_KEY "/apps/vinagre/plugins" +#define VINAGRE_PLUGINS_ENGINE_KEY VINAGRE_PLUGINS_ENGINE_BASE_KEY "/active-plugins" + +#define PLUGIN_EXT ".vinagre-plugin" +#define LOADER_EXT G_MODULE_SUFFIX + +typedef struct +{ + VinagrePluginLoader *loader; + VinagreObjectModule *module; +} LoaderInfo; + +/* Signals */ +enum +{ + ACTIVATE_PLUGIN, + DEACTIVATE_PLUGIN, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL]; + +G_DEFINE_TYPE(VinagrePluginsEngine, vinagre_plugins_engine, G_TYPE_OBJECT) + +struct _VinagrePluginsEnginePrivate +{ + GSList *plugin_list; + GHashTable *loaders; + GHashTable *protocols; + + gboolean activate_from_prefs; +}; + +VinagrePluginsEngine *default_engine = NULL; + +static void vinagre_plugins_engine_activate_plugin_real (VinagrePluginsEngine *engine, + VinagrePluginInfo *info); +static void vinagre_plugins_engine_deactivate_plugin_real (VinagrePluginsEngine *engine, + VinagrePluginInfo *info); + +typedef gboolean (*LoadDirCallback)(VinagrePluginsEngine *engine, const gchar *filename, gpointer userdata); + +static gboolean +load_dir_real (VinagrePluginsEngine *engine, + const gchar *dir, + const gchar *suffix, + LoadDirCallback callback, + gpointer userdata) +{ + GError *error = NULL; + GDir *d; + const gchar *dirent; + gboolean ret = TRUE; + + g_return_val_if_fail (dir != NULL, TRUE); + + vinagre_debug_message (DEBUG_PLUGINS, "DIR: %s", dir); + + d = g_dir_open (dir, 0, &error); + if (!d) + { + g_warning ("%s", error->message); + g_error_free (error); + return TRUE; + } + + while ((dirent = g_dir_read_name (d))) + { + gchar *filename; + + if (!g_str_has_suffix (dirent, suffix)) + continue; + + filename = g_build_filename (dir, dirent, NULL); + + ret = callback (engine, filename, userdata); + + g_free (filename); + + if (!ret) + break; + } + + g_dir_close (d); + return ret; +} + +static gboolean +load_plugin_info (VinagrePluginsEngine *engine, + const gchar *filename, + gpointer userdata) +{ + VinagrePluginInfo *info; + + info = _vinagre_plugin_info_new (filename); + + if (info == NULL) + return TRUE; + + /* If a plugin with this name has already been loaded + * drop this one (user plugins override system plugins) */ + if (vinagre_plugins_engine_get_plugin_info (engine, vinagre_plugin_info_get_module_name (info)) != NULL) + { + vinagre_debug_message (DEBUG_PLUGINS, "Two or more plugins named '%s'. " + "Only the first will be considered.\n", + vinagre_plugin_info_get_module_name (info)); + + _vinagre_plugin_info_unref (info); + + return TRUE; + } + + engine->priv->plugin_list = g_slist_prepend (engine->priv->plugin_list, info); + + vinagre_debug_message (DEBUG_PLUGINS, "Plugin %s loaded", info->name); + return TRUE; +} + +static void +load_all_plugins (VinagrePluginsEngine *engine) +{ + gchar *plugin_dir; + const gchar *pdirs_env = NULL; + + /* load user plugins */ + plugin_dir = vinagre_dirs_get_user_plugins_dir (); + if (g_file_test (plugin_dir, G_FILE_TEST_IS_DIR)) + { + load_dir_real (engine, + plugin_dir, + PLUGIN_EXT, + load_plugin_info, + NULL); + + } + g_free (plugin_dir); + + /* load system plugins */ + pdirs_env = g_getenv ("VINAGRE_PLUGINS_PATH"); + + vinagre_debug_message (DEBUG_PLUGINS, "VINAGRE_PLUGINS_PATH=%s", pdirs_env); + + if (pdirs_env != NULL) + { + gchar **pdirs; + gint i; + + pdirs = g_strsplit (pdirs_env, G_SEARCHPATH_SEPARATOR_S, 0); + + for (i = 0; pdirs[i] != NULL; i++) + { + if (!load_dir_real (engine, + pdirs[i], + PLUGIN_EXT, + load_plugin_info, + NULL)) + { + break; + } + } + + g_strfreev (pdirs); + } + else + { + plugin_dir = vinagre_dirs_get_vinagre_plugins_dir (); + + load_dir_real (engine, + plugin_dir, + PLUGIN_EXT, + load_plugin_info, + NULL); + + g_free (plugin_dir); + } +} + +static guint +hash_lowercase (gconstpointer data) +{ + gchar *lowercase; + guint ret; + + lowercase = g_ascii_strdown ((const gchar *)data, -1); + ret = g_str_hash (lowercase); + g_free (lowercase); + + return ret; +} + +static gboolean +equal_lowercase (gconstpointer a, gconstpointer b) +{ + return g_ascii_strcasecmp ((const gchar *)a, (const gchar *)b) == 0; +} + +static void +loader_destroy (LoaderInfo *info) +{ + if (!info) + return; + + if (info->loader) + g_object_unref (info->loader); + + g_free (info); +} + +static void +add_loader (VinagrePluginsEngine *engine, + const gchar *loader_id, + VinagreObjectModule *module) +{ + LoaderInfo *info; + + info = g_new (LoaderInfo, 1); + info->loader = NULL; + info->module = module; + + g_hash_table_insert (engine->priv->loaders, g_strdup (loader_id), info); +} + +static void +activate_engine_plugins (VinagrePluginsEngine *engine) +{ + GSList *active_plugins, *l; + + vinagre_debug_message (DEBUG_PLUGINS, "Activating engine plugins"); + + g_object_get (vinagre_prefs_get_default (), + "active-plugins", &active_plugins, + NULL); + + for (l = engine->priv->plugin_list; l; l = l->next) + { + VinagrePluginInfo *info = (VinagrePluginInfo*)l->data; + + if (g_slist_find_custom (active_plugins, + vinagre_plugin_info_get_module_name (info), + (GCompareFunc)strcmp) == NULL) + continue; + + if (vinagre_plugin_info_is_engine (info)) + vinagre_plugins_engine_activate_plugin (engine, info); + } +} + +static void +vinagre_plugins_engine_init (VinagrePluginsEngine *engine) +{ + vinagre_debug (DEBUG_PLUGINS); + + if (!g_module_supported ()) + { + g_warning ("vinagre is not able to initialize the plugins engine."); + return; + } + + engine->priv = G_TYPE_INSTANCE_GET_PRIVATE (engine, + VINAGRE_TYPE_PLUGINS_ENGINE, + VinagrePluginsEnginePrivate); + + load_all_plugins (engine); + + /* make sure that the first reactivation will read active plugins + from the prefs */ + engine->priv->activate_from_prefs = TRUE; + + /* mapping from loadername -> loader object */ + engine->priv->loaders = g_hash_table_new_full (hash_lowercase, + equal_lowercase, + (GDestroyNotify)g_free, + (GDestroyNotify)loader_destroy); + + engine->priv->protocols = g_hash_table_new (g_str_hash, g_str_equal); + activate_engine_plugins (engine); +} + +static void +loader_garbage_collect (const char *id, + LoaderInfo *info) +{ + if (info->loader) + vinagre_plugin_loader_garbage_collect (info->loader); +} + +void +vinagre_plugins_engine_garbage_collect (VinagrePluginsEngine *engine) +{ + g_hash_table_foreach (engine->priv->loaders, + (GHFunc) loader_garbage_collect, + NULL); +} + +static void +vinagre_plugins_engine_finalize (GObject *object) +{ + VinagrePluginsEngine *engine = VINAGRE_PLUGINS_ENGINE (object); + GSList *item; + + vinagre_debug (DEBUG_PLUGINS); + + /* Firs deactivate all plugins */ + for (item = engine->priv->plugin_list; item; item = item->next) + { + VinagrePluginInfo *info = VINAGRE_PLUGIN_INFO (item->data); + + if (vinagre_plugin_info_is_active (info)) + vinagre_plugins_engine_deactivate_plugin_real (engine, info); + } + + /* unref the loaders */ + g_hash_table_destroy (engine->priv->loaders); + + g_hash_table_destroy (engine->priv->protocols); + + /* and finally free the infos */ + for (item = engine->priv->plugin_list; item; item = item->next) + { + VinagrePluginInfo *info = VINAGRE_PLUGIN_INFO (item->data); + + _vinagre_plugin_info_unref (info); + } + + g_slist_free (engine->priv->plugin_list); + + G_OBJECT_CLASS (vinagre_plugins_engine_parent_class)->finalize (object); +} + +static void +vinagre_plugins_engine_class_init (VinagrePluginsEngineClass *klass) +{ + GType the_type = G_TYPE_FROM_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = vinagre_plugins_engine_finalize; + klass->activate_plugin = vinagre_plugins_engine_activate_plugin_real; + klass->deactivate_plugin = vinagre_plugins_engine_deactivate_plugin_real; + + signals[ACTIVATE_PLUGIN] = + g_signal_new ("activate-plugin", + the_type, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (VinagrePluginsEngineClass, activate_plugin), + NULL, NULL, + g_cclosure_marshal_VOID__BOXED, + G_TYPE_NONE, + 1, + VINAGRE_TYPE_PLUGIN_INFO | G_SIGNAL_TYPE_STATIC_SCOPE); + + signals[DEACTIVATE_PLUGIN] = + g_signal_new ("deactivate-plugin", + the_type, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (VinagrePluginsEngineClass, deactivate_plugin), + NULL, NULL, + g_cclosure_marshal_VOID__BOXED, + G_TYPE_NONE, + 1, + VINAGRE_TYPE_PLUGIN_INFO | G_SIGNAL_TYPE_STATIC_SCOPE); + + g_type_class_add_private (klass, sizeof (VinagrePluginsEnginePrivate)); +} + +static gboolean +load_loader (VinagrePluginsEngine *engine, + const gchar *filename, + gpointer data) +{ + VinagreObjectModule *module; + gchar *base; + gchar *path; + const gchar *id; + GType type; + + /* try to load in the module */ + path = g_path_get_dirname (filename); + base = g_path_get_basename (filename); + + /* for now they are all resident */ + module = vinagre_object_module_new (base, + path, + "register_vinagre_plugin_loader", + TRUE); + + g_free (base); + g_free (path); + + /* make sure to load the type definition */ + if (!g_type_module_use (G_TYPE_MODULE (module))) + { + g_object_unref (module); + g_warning ("Plugin loader module `%s' could not be loaded", filename); + + return TRUE; + } + + /* get the exported type and check the name as exported by the + * loader interface */ + type = vinagre_object_module_get_object_type (module); + id = vinagre_plugin_loader_type_get_id (type); + + add_loader (engine, id, module); + g_type_module_unuse (G_TYPE_MODULE (module)); + + return TRUE; +} + +static void +ensure_loader (LoaderInfo *info) +{ + if (info->loader == NULL && info->module != NULL) + { + /* create a new loader object */ + VinagrePluginLoader *loader; + loader = (VinagrePluginLoader *)vinagre_object_module_new_object (info->module, NULL); + + if (loader == NULL || !VINAGRE_IS_PLUGIN_LOADER (loader)) + { + g_warning ("Loader object is not a valid VinagrePluginLoader instance"); + + if (loader != NULL && G_IS_OBJECT (loader)) + g_object_unref (loader); + } + else + { + info->loader = loader; + } + } +} + +static VinagrePluginLoader * +get_plugin_loader (VinagrePluginsEngine *engine, + VinagrePluginInfo *info) +{ + const gchar *loader_id; + LoaderInfo *loader_info; + + loader_id = info->loader; + + loader_info = (LoaderInfo *)g_hash_table_lookup ( + engine->priv->loaders, + loader_id); + + if (loader_info == NULL) + { + gchar *loader_dir; + + loader_dir = vinagre_dirs_get_vinagre_plugin_loaders_dir (); + + /* loader could not be found in the hash, try to find it by + scanning */ + load_dir_real (engine, + loader_dir, + LOADER_EXT, + (LoadDirCallback)load_loader, + NULL); + g_free (loader_dir); + + loader_info = (LoaderInfo *)g_hash_table_lookup ( + engine->priv->loaders, + loader_id); + } + + if (loader_info == NULL) + { + /* cache non-existent so we don't scan again */ + add_loader (engine, loader_id, NULL); + return NULL; + } + + ensure_loader (loader_info); + return loader_info->loader; +} + +VinagrePluginsEngine * +vinagre_plugins_engine_get_default (void) +{ + if (default_engine != NULL) + return default_engine; + + default_engine = VINAGRE_PLUGINS_ENGINE (g_object_new (VINAGRE_TYPE_PLUGINS_ENGINE, NULL)); + g_object_add_weak_pointer (G_OBJECT (default_engine), + (gpointer) &default_engine); + return default_engine; +} + +const GSList * +vinagre_plugins_engine_get_plugin_list (VinagrePluginsEngine *engine) +{ + vinagre_debug (DEBUG_PLUGINS); + return engine->priv->plugin_list; +} + +static gint +compare_plugin_info_and_name (VinagrePluginInfo *info, + const gchar *module_name) +{ + return strcmp (vinagre_plugin_info_get_module_name (info), module_name); +} + +VinagrePluginInfo * +vinagre_plugins_engine_get_plugin_info (VinagrePluginsEngine *engine, + const gchar *name) +{ + GSList *l = g_slist_find_custom (engine->priv->plugin_list, + name, + (GCompareFunc) compare_plugin_info_and_name); + + return l == NULL ? NULL : (VinagrePluginInfo *) l->data; +} + +static void +save_active_plugin_list (VinagrePluginsEngine *engine) +{ + GSList *l, *active_plugins = NULL; + + for (l = engine->priv->plugin_list; l != NULL; l = l->next) + { + VinagrePluginInfo *info = (VinagrePluginInfo *) l->data; + + if (vinagre_plugin_info_is_active (info)) + active_plugins = g_slist_prepend (active_plugins, + (gpointer)vinagre_plugin_info_get_module_name (info)); + } + + g_object_set (vinagre_prefs_get_default (), + "active-plugins", active_plugins, + NULL); + + g_slist_free (active_plugins); +} + +static gboolean +load_plugin (VinagrePluginsEngine *engine, + VinagrePluginInfo *info) +{ + VinagrePluginLoader *loader; + gchar *path; + + if (vinagre_plugin_info_is_active (info)) + return TRUE; + + if (!vinagre_plugin_info_is_available (info)) + return FALSE; + + loader = get_plugin_loader (engine, info); + + if (loader == NULL) + { + g_warning ("Could not find loader `%s' for plugin `%s'", info->loader, info->name); + info->available = FALSE; + return FALSE; + } + + path = g_path_get_dirname (info->file); + g_return_val_if_fail (path != NULL, FALSE); + + info->plugin = vinagre_plugin_loader_load (loader, info, path); + + g_free (path); + + if (info->plugin == NULL) + { + g_warning ("Error loading plugin '%s'", info->name); + info->available = FALSE; + return FALSE; + } + + g_object_set_data (G_OBJECT (info->plugin), "info", info); + + return TRUE; +} + +static void +vinagre_plugins_engine_activate_plugin_real (VinagrePluginsEngine *engine, + VinagrePluginInfo *info) +{ + const GList *wins; + const gchar *protocol; + VinagrePluginInfo *plugin_protocol; + + if (!load_plugin (engine, info)) + return; + + if (vinagre_plugin_info_is_engine (info)) + { + protocol = vinagre_plugin_get_protocol (info->plugin); + plugin_protocol = g_hash_table_lookup (engine->priv->protocols, protocol); + if (plugin_protocol) + { + g_warning ("The protocol %s was already registered by the plugin %s", + protocol, + vinagre_plugin_info_get_name (plugin_protocol)); + return; + } + + g_hash_table_insert (engine->priv->protocols, (gpointer)protocol, info->plugin); + return; + } + + /* activate plugin for all windows */ + wins = vinagre_app_get_windows (vinagre_app_get_default ()); + for (; wins != NULL; wins = wins->next) + vinagre_plugin_activate (info->plugin, VINAGRE_WINDOW (wins->data)); +} + +gboolean +vinagre_plugins_engine_activate_plugin (VinagrePluginsEngine *engine, + VinagrePluginInfo *info) +{ + vinagre_debug (DEBUG_PLUGINS); + + g_return_val_if_fail (info != NULL, FALSE); + + if (!vinagre_plugin_info_is_available (info)) + return FALSE; + + if (vinagre_plugin_info_is_active (info)) + return TRUE; + + g_signal_emit (engine, signals[ACTIVATE_PLUGIN], 0, info); + + if (vinagre_plugin_info_is_active (info)) + save_active_plugin_list (engine); + + return vinagre_plugin_info_is_active (info); +} + +static void +call_plugin_deactivate (VinagrePlugin *plugin, + VinagreWindow *window) +{ + vinagre_plugin_deactivate (plugin, window); + + /* ensure update of ui manager, because we suspect it does something + with expected static strings in the type module (when unloaded the + strings don't exist anymore, and ui manager updates in an idle + func) */ + gtk_ui_manager_ensure_update (vinagre_window_get_ui_manager (window)); +} + +static void +vinagre_plugins_engine_deactivate_plugin_real (VinagrePluginsEngine *engine, + VinagrePluginInfo *info) +{ + const GList *wins; + VinagrePluginLoader *loader; + + if (!vinagre_plugin_info_is_active (info) || + !vinagre_plugin_info_is_available (info)) + return; + + if (vinagre_plugin_info_is_engine (info)) + { + g_hash_table_remove (engine->priv->protocols, + vinagre_plugin_get_protocol (info->plugin)); + vinagre_plugin_deactivate (info->plugin, NULL); + } + else + { + wins = vinagre_app_get_windows (vinagre_app_get_default ()); + for (; wins != NULL; wins = wins->next) + call_plugin_deactivate (info->plugin, VINAGRE_WINDOW (wins->data)); + } + + /* first unref the plugin (the loader still has one) */ + g_object_unref (info->plugin); + + /* find the loader and tell it to gc and unload the plugin */ + loader = get_plugin_loader (engine, info); + + vinagre_plugin_loader_garbage_collect (loader); + vinagre_plugin_loader_unload (loader, info); + + info->plugin = NULL; +} + +gboolean +vinagre_plugins_engine_deactivate_plugin (VinagrePluginsEngine *engine, + VinagrePluginInfo *info) +{ + vinagre_debug (DEBUG_PLUGINS); + + g_return_val_if_fail (info != NULL, FALSE); + + if (!vinagre_plugin_info_is_active (info)) + return TRUE; + + g_signal_emit (engine, signals[DEACTIVATE_PLUGIN], 0, info); + if (!vinagre_plugin_info_is_active (info)) + save_active_plugin_list (engine); + + return !vinagre_plugin_info_is_active (info); +} + +void +vinagre_plugins_engine_activate_plugins (VinagrePluginsEngine *engine, + VinagreWindow *window) +{ + GSList *pl, *active_plugins = NULL; + + vinagre_debug (DEBUG_PLUGINS); + + g_return_if_fail (VINAGRE_IS_PLUGINS_ENGINE (engine)); + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + /* the first time, we get the 'active' plugins from gconf */ + if (engine->priv->activate_from_prefs) + { + g_object_get (vinagre_prefs_get_default (), + "active-plugins", &active_plugins, + NULL); + } + + for (pl = engine->priv->plugin_list; pl; pl = pl->next) + { + VinagrePluginInfo *info = (VinagrePluginInfo*)pl->data; + + if (engine->priv->activate_from_prefs && + g_slist_find_custom (active_plugins, + vinagre_plugin_info_get_module_name (info), + (GCompareFunc)strcmp) == NULL) + continue; + + /* If plugin is not active, don't try to activate/load it */ + if (!engine->priv->activate_from_prefs && + !vinagre_plugin_info_is_active (info)) + continue; + + if (load_plugin (engine, info)) + vinagre_plugin_activate (info->plugin, window); + } + + if (engine->priv->activate_from_prefs) + { + g_slist_foreach (active_plugins, (GFunc) g_free, NULL); + g_slist_free (active_plugins); + engine->priv->activate_from_prefs = FALSE; + } + + vinagre_debug_message (DEBUG_PLUGINS, "End"); + + /* also call update_ui after activation */ + vinagre_plugins_engine_update_plugins_ui (engine, window); +} + +void +vinagre_plugins_engine_deactivate_plugins (VinagrePluginsEngine *engine, + VinagreWindow *window) +{ + GSList *pl; + + vinagre_debug (DEBUG_PLUGINS); + + g_return_if_fail (VINAGRE_IS_PLUGINS_ENGINE (engine)); + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + for (pl = engine->priv->plugin_list; pl; pl = pl->next) + { + VinagrePluginInfo *info = (VinagrePluginInfo*)pl->data; + + /* check if the plugin is actually active */ + if (!vinagre_plugin_info_is_active (info)) + continue; + + /* call deactivate for the plugin for this window */ + vinagre_plugin_deactivate (info->plugin, window); + } + + vinagre_debug_message (DEBUG_PLUGINS, "End"); +} + +void +vinagre_plugins_engine_update_plugins_ui (VinagrePluginsEngine *engine, + VinagreWindow *window) +{ + GSList *pl; + + vinagre_debug (DEBUG_PLUGINS); + + g_return_if_fail (VINAGRE_IS_PLUGINS_ENGINE (engine)); + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + /* call update_ui for all active plugins */ + for (pl = engine->priv->plugin_list; pl; pl = pl->next) + { + VinagrePluginInfo *info = (VinagrePluginInfo*)pl->data; + + if (!vinagre_plugin_info_is_active (info)) + continue; + + vinagre_debug_message (DEBUG_PLUGINS, "Updating UI of %s", info->name); + vinagre_plugin_update_ui (info->plugin, window); + } +} + +void +vinagre_plugins_engine_configure_plugin (VinagrePluginsEngine *engine, + VinagrePluginInfo *info, + GtkWindow *parent) +{ + GtkWidget *conf_dlg; + + GtkWindowGroup *wg; + + vinagre_debug (DEBUG_PLUGINS); + + g_return_if_fail (info != NULL); + + conf_dlg = vinagre_plugin_create_configure_dialog (info->plugin); + g_return_if_fail (conf_dlg != NULL); + gtk_window_set_transient_for (GTK_WINDOW (conf_dlg), + parent); + + wg = parent->group; + if (wg == NULL) + { + wg = gtk_window_group_new (); + gtk_window_group_add_window (wg, parent); + } + + gtk_window_group_add_window (wg, + GTK_WINDOW (conf_dlg)); + + gtk_window_set_modal (GTK_WINDOW (conf_dlg), TRUE); + gtk_widget_show (conf_dlg); +} + +void +vinagre_plugins_engine_active_plugins_changed (VinagrePluginsEngine *engine) +{ + gboolean to_activate; + GSList *pl, *active_plugins; + + vinagre_debug (DEBUG_PLUGINS); + + g_object_get (vinagre_prefs_get_default (), + "active-plugins", &active_plugins, + NULL); + + for (pl = engine->priv->plugin_list; pl; pl = pl->next) + { + VinagrePluginInfo *info = (VinagrePluginInfo*)pl->data; + + if (!vinagre_plugin_info_is_available (info)) + continue; + + to_activate = (g_slist_find_custom (active_plugins, + vinagre_plugin_info_get_module_name (info), + (GCompareFunc)strcmp) != NULL); + + if (!vinagre_plugin_info_is_active (info) && to_activate) + g_signal_emit (engine, signals[ACTIVATE_PLUGIN], 0, info); + else if (vinagre_plugin_info_is_active (info) && !to_activate) + g_signal_emit (engine, signals[DEACTIVATE_PLUGIN], 0, info); + } + + g_slist_foreach (active_plugins, (GFunc) g_free, NULL); + g_slist_free (active_plugins); +} + +void +vinagre_plugins_engine_rescan_plugins (VinagrePluginsEngine *engine) +{ + vinagre_debug (DEBUG_PLUGINS); + + load_all_plugins (engine); +} + +GHashTable * +vinagre_plugin_engine_get_plugins_by_protocol (VinagrePluginsEngine *engine) +{ + return engine->priv->protocols; +} + +VinagrePlugin * +vinagre_plugins_engine_get_plugin_by_protocol (VinagrePluginsEngine *engine, + const gchar *protocol) +{ + g_return_val_if_fail (VINAGRE_IS_PLUGINS_ENGINE (engine), NULL); + + return g_hash_table_lookup (engine->priv->protocols, (gconstpointer) protocol); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-plugins-engine.h vinagre-2.29.1/vinagre/vinagre-plugins-engine.h --- vinagre-2.26.1/vinagre/vinagre-plugins-engine.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-plugins-engine.h 2009-07-28 15:49:00.000000000 +0100 @@ -0,0 +1,103 @@ +/* + * vinagre-plugins-engine.h + * This file is part of vinagre + * + * Based on gedit plugin system + * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2009 Jonh Wendell + * + * vinagre-plugins-engine.h 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. + * + * vinagre-plugins-engine.h 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef __VINAGRE_PLUGINS_ENGINE_H__ +#define __VINAGRE_PLUGINS_ENGINE_H__ + +#include +#include "vinagre-window.h" +#include "vinagre-plugin-info.h" +#include "vinagre-plugin.h" +#include "vinagre-connection.h" + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_PLUGINS_ENGINE (vinagre_plugins_engine_get_type ()) +#define VINAGRE_PLUGINS_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_PLUGINS_ENGINE, VinagrePluginsEngine)) +#define VINAGRE_PLUGINS_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_PLUGINS_ENGINE, VinagrePluginsEngineClass)) +#define VINAGRE_IS_PLUGINS_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_PLUGINS_ENGINE)) +#define VINAGRE_IS_PLUGINS_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_PLUGINS_ENGINE)) +#define VINAGRE_PLUGINS_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_PLUGINS_ENGINE, VinagrePluginsEngineClass)) + +typedef struct _VinagrePluginsEngine VinagrePluginsEngine; +typedef struct _VinagrePluginsEnginePrivate VinagrePluginsEnginePrivate; + +struct _VinagrePluginsEngine +{ + GObject parent; + VinagrePluginsEnginePrivate *priv; +}; + +typedef struct _VinagrePluginsEngineClass VinagrePluginsEngineClass; + +struct _VinagrePluginsEngineClass +{ + GObjectClass parent_class; + + void (* activate_plugin) (VinagrePluginsEngine *engine, + VinagrePluginInfo *info); + + void (* deactivate_plugin) (VinagrePluginsEngine *engine, + VinagrePluginInfo *info); +}; + +GType vinagre_plugins_engine_get_type (void) G_GNUC_CONST; + +VinagrePluginsEngine *vinagre_plugins_engine_get_default (void); + +void vinagre_plugins_engine_garbage_collect (VinagrePluginsEngine *engine); + +const GSList *vinagre_plugins_engine_get_plugin_list (VinagrePluginsEngine *engine); + +VinagrePluginInfo *vinagre_plugins_engine_get_plugin_info (VinagrePluginsEngine *engine, + const gchar *name); + +/* plugin load and unloading (overall, for all windows) */ +gboolean vinagre_plugins_engine_activate_plugin (VinagrePluginsEngine *engine, + VinagrePluginInfo *info); +gboolean vinagre_plugins_engine_deactivate_plugin (VinagrePluginsEngine *engine, + VinagrePluginInfo *info); + +void vinagre_plugins_engine_configure_plugin (VinagrePluginsEngine *engine, + VinagrePluginInfo *info, + GtkWindow *parent); + +/* plugin activation/deactivation per window, private to VinagreWindow */ +void vinagre_plugins_engine_activate_plugins (VinagrePluginsEngine *engine, + VinagreWindow *window); +void vinagre_plugins_engine_deactivate_plugins (VinagrePluginsEngine *engine, + VinagreWindow *window); +void vinagre_plugins_engine_update_plugins_ui (VinagrePluginsEngine *engine, + VinagreWindow *window); + +/* private for gconf notification */ +void vinagre_plugins_engine_active_plugins_changed (VinagrePluginsEngine *engine); + +void vinagre_plugins_engine_rescan_plugins (VinagrePluginsEngine *engine); + +GHashTable *vinagre_plugin_engine_get_plugins_by_protocol (VinagrePluginsEngine *engine); +VinagrePlugin *vinagre_plugins_engine_get_plugin_by_protocol (VinagrePluginsEngine *engine, + const gchar *protocol); + +G_END_DECLS + +#endif /* __VINAGRE_PLUGINS_ENGINE_H__ */ diff -Nru vinagre-2.26.1/vinagre/vinagre-prefs.c vinagre-2.29.1/vinagre/vinagre-prefs.c --- vinagre-2.26.1/vinagre/vinagre-prefs.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-prefs.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,574 @@ +/* + * vinagre-prefs.c + * This file is part of vinagre + * + * Copyright (C) Jonh Wendell 2008,2009 + * + * vinagre-prefs.c 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. + * + * vinagre-prefs.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include +#include "vinagre-prefs.h" +#include "vinagre-utils.h" + +#define VINAGRE_BASE_KEY "/apps/vinagre" +#define VM_ALWAYS_SHOW_TABS VINAGRE_BASE_KEY "/always_show_tabs" +#define VM_SHARED_FLAG VINAGRE_BASE_KEY "/shared_flag" +#define VM_TOOLBAR_VISIBLE VINAGRE_BASE_KEY "/toolbar_visible" +#define VM_STATUSBAR_VISIBLE VINAGRE_BASE_KEY "/statusbar_visible" +#define VM_SIDE_PANEL_VISIBLE VINAGRE_BASE_KEY "/side_pane_visible" +#define VM_SHOW_ACCELS VINAGRE_BASE_KEY "/show_accels" +#define VM_HISTORY_SIZE VINAGRE_BASE_KEY "/history_size" +#define VM_ALWAYS_ENABLE_LISTENING VINAGRE_BASE_KEY "/always_enable_listening" + +#define VM_WINDOW_STATE VINAGRE_BASE_KEY "/window_state" +#define VM_WINDOW_WIDTH VINAGRE_BASE_KEY "/window_width" +#define VM_WINDOW_HEIGHT VINAGRE_BASE_KEY "/window_height" +#define VM_SIDE_PANEL_SIZE VINAGRE_BASE_KEY "/side_panel_size" +#define VM_LAST_PROTOCOL VINAGRE_BASE_KEY "/last_protocol" + +#define VINAGRE_PLUGINS_DIR VINAGRE_BASE_KEY "/plugins" +#define VM_ACTIVE_PLUGINS VINAGRE_PLUGINS_DIR "/active-plugins" + +struct _VinagrePrefsPrivate +{ + GConfClient *gconf_client; +}; + +/* Properties */ +enum +{ + PROP_0, + PROP_SHARED_FLAG, + PROP_ALWAYS_SHOW_TABS, + PROP_TOOLBAR_VISIBLE, + PROP_STATUSBAR_VISIBLE, + PROP_SIDE_PANEL_VISIBLE, + PROP_WINDOW_STATE, + PROP_WINDOW_WIDTH, + PROP_WINDOW_HEIGHT, + PROP_SIDE_PANEL_SIZE, + PROP_SHOW_ACCELS, + PROP_HISTORY_SIZE, + PROP_ACTIVE_PLUGINS, + PROP_LAST_PROTOCOL, + PROP_ALWAYS_ENABLE_LISTENING +}; + +G_DEFINE_TYPE (VinagrePrefs, vinagre_prefs, G_TYPE_OBJECT); + +static VinagrePrefs *prefs_singleton = NULL; + +VinagrePrefs * +vinagre_prefs_get_default (void) +{ + if (G_UNLIKELY (!prefs_singleton)) + prefs_singleton = VINAGRE_PREFS (g_object_new (VINAGRE_TYPE_PREFS, + NULL)); + return prefs_singleton; +} + +static gboolean +vinagre_prefs_get_bool (VinagrePrefs *prefs, const gchar* key, gboolean def) +{ + GError* error = NULL; + GConfValue* val; + + val = gconf_client_get (prefs->priv->gconf_client, key, &error); + + if (val != NULL) + { + gboolean retval = def; + + g_return_val_if_fail (error == NULL, retval); + + if (val->type == GCONF_VALUE_BOOL) + retval = gconf_value_get_bool (val); + + gconf_value_free (val); + + return retval; + } + else + return def; +} + +static gboolean +vinagre_prefs_get_int (VinagrePrefs *prefs, const gchar* key, gint def) +{ + GError* error = NULL; + GConfValue* val; + + val = gconf_client_get (prefs->priv->gconf_client, key, &error); + + if (val != NULL) + { + gint retval = def; + + g_return_val_if_fail (error == NULL, retval); + + if (val->type == GCONF_VALUE_INT) + retval = gconf_value_get_int (val); + + gconf_value_free (val); + + return retval; + } + else + return def; +} + +static gchar * +vinagre_prefs_get_string (VinagrePrefs *prefs, const gchar *key, const gchar *def) +{ + gchar *result; + + result = gconf_client_get_string (prefs->priv->gconf_client, key, NULL); + if (!result) + result = g_strdup (def); + + return result; +} + +static GSList * +vinagre_prefs_get_list (VinagrePrefs *prefs, const gchar* key) +{ + return gconf_client_get_list (prefs->priv->gconf_client, + key, + GCONF_VALUE_STRING, + NULL); +} + +static void +vinagre_prefs_set_bool (VinagrePrefs *prefs, const gchar* key, gboolean value) +{ + GError *error = NULL; + + if (!gconf_client_set_bool (prefs->priv->gconf_client, key, value, &error)) + { + g_warning ("Setting key %s failed: %s", key, error->message); + g_error_free (error); + } +} + +static void +vinagre_prefs_set_int (VinagrePrefs *prefs, const gchar* key, gint value) +{ + GError *error = NULL; + + if (!gconf_client_set_int (prefs->priv->gconf_client, key, value, &error)) + { + g_warning ("Setting key %s failed: %s", key, error->message); + g_error_free (error); + } +} + +static void +vinagre_prefs_set_string (VinagrePrefs *prefs, const gchar *key, const gchar *value) +{ + GError *error = NULL; + + if (!gconf_client_set_string (prefs->priv->gconf_client, key, value, &error)) + { + g_warning ("Setting key %s failed: %s", key, error->message); + g_error_free (error); + } +} + +static void +vinagre_prefs_set_list (VinagrePrefs *prefs, const gchar* key, GSList *list) +{ + GError *error = NULL; + + if (!gconf_client_set_list (prefs->priv->gconf_client, key, + GCONF_VALUE_STRING, list, + &error)) + { + g_warning ("Setting key %s failed: %s", key, error->message); + g_error_free (error); + } +} + +static void +vinagre_prefs_always_show_tabs_notify (GConfClient *client, + guint cnx_id, + GConfEntry *entry, + VinagrePrefs *prefs) +{ + g_object_notify (G_OBJECT (prefs), "always-show-tabs"); +} + +static void +vinagre_prefs_show_accels_notify (GConfClient *client, + guint cnx_id, + GConfEntry *entry, + VinagrePrefs *prefs) +{ + g_object_notify (G_OBJECT (prefs), "show-accels"); +} + +static void +vinagre_prefs_init (VinagrePrefs *prefs) +{ + prefs->priv = G_TYPE_INSTANCE_GET_PRIVATE (prefs, VINAGRE_TYPE_PREFS, VinagrePrefsPrivate); + + prefs->priv->gconf_client = gconf_client_get_default (); + if (prefs->priv->gconf_client == NULL) + g_critical (_("Cannot initialize preferences manager.")); + + gconf_client_add_dir (prefs->priv->gconf_client, + VINAGRE_BASE_KEY, + GCONF_CLIENT_PRELOAD_ONELEVEL, + NULL); + + gconf_client_notify_add (prefs->priv->gconf_client, + VM_ALWAYS_SHOW_TABS, + (GConfClientNotifyFunc) vinagre_prefs_always_show_tabs_notify, + prefs, NULL, NULL); + gconf_client_notify_add (prefs->priv->gconf_client, + VM_SHOW_ACCELS, + (GConfClientNotifyFunc) vinagre_prefs_show_accels_notify, + prefs, NULL, NULL); + +} + +static void +vinagre_prefs_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +{ + VinagrePrefs *prefs = VINAGRE_PREFS (object); + + switch (prop_id) + { + case PROP_SHARED_FLAG: + vinagre_prefs_set_bool (prefs, VM_SHARED_FLAG, g_value_get_boolean (value)); + break; + case PROP_ALWAYS_SHOW_TABS: + vinagre_prefs_set_bool (prefs, VM_ALWAYS_SHOW_TABS, g_value_get_boolean (value)); + break; + case PROP_TOOLBAR_VISIBLE: + vinagre_prefs_set_bool (prefs, VM_TOOLBAR_VISIBLE, g_value_get_boolean (value)); + break; + case PROP_STATUSBAR_VISIBLE: + vinagre_prefs_set_bool (prefs, VM_STATUSBAR_VISIBLE, g_value_get_boolean (value)); + break; + case PROP_SIDE_PANEL_VISIBLE: + vinagre_prefs_set_bool (prefs, VM_SIDE_PANEL_VISIBLE, g_value_get_boolean (value)); + break; + case PROP_WINDOW_STATE: + vinagre_prefs_set_int (prefs, VM_WINDOW_STATE, g_value_get_int (value)); + break; + case PROP_WINDOW_WIDTH: + vinagre_prefs_set_int (prefs, VM_WINDOW_WIDTH, g_value_get_int (value)); + break; + case PROP_WINDOW_HEIGHT: + vinagre_prefs_set_int (prefs, VM_WINDOW_HEIGHT, g_value_get_int (value)); + break; + case PROP_SIDE_PANEL_SIZE: + vinagre_prefs_set_int (prefs, VM_SIDE_PANEL_SIZE, g_value_get_int (value)); + break; + case PROP_SHOW_ACCELS: + vinagre_prefs_set_bool (prefs, VM_SHOW_ACCELS, g_value_get_boolean (value)); + break; + case PROP_HISTORY_SIZE: + vinagre_prefs_set_int (prefs, VM_HISTORY_SIZE, g_value_get_int (value)); + break; + case PROP_ACTIVE_PLUGINS: + vinagre_prefs_set_list (prefs, VM_ACTIVE_PLUGINS, g_value_get_pointer (value)); + break; + case PROP_LAST_PROTOCOL: + vinagre_prefs_set_string (prefs, VM_LAST_PROTOCOL, g_value_get_string (value)); + break; + case PROP_ALWAYS_ENABLE_LISTENING: + vinagre_prefs_set_bool (prefs, VM_ALWAYS_ENABLE_LISTENING, g_value_get_boolean (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_prefs_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + VinagrePrefs *prefs = VINAGRE_PREFS (object); + gchar *str; + + switch (prop_id) + { + case PROP_SHARED_FLAG: + g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_SHARED_FLAG, TRUE)); + break; + case PROP_ALWAYS_SHOW_TABS: + g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_ALWAYS_SHOW_TABS, FALSE)); + break; + case PROP_TOOLBAR_VISIBLE: + g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_TOOLBAR_VISIBLE, TRUE)); + break; + case PROP_STATUSBAR_VISIBLE: + g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_STATUSBAR_VISIBLE, TRUE)); + break; + case PROP_SIDE_PANEL_VISIBLE: + g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_SIDE_PANEL_VISIBLE, TRUE)); + break; + case PROP_WINDOW_STATE: + g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_WINDOW_STATE, 0)); + break; + case PROP_WINDOW_WIDTH: + g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_WINDOW_WIDTH, 650)); + break; + case PROP_WINDOW_HEIGHT: + g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_WINDOW_HEIGHT, 500)); + break; + case PROP_SIDE_PANEL_SIZE: + g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_SIDE_PANEL_SIZE, 200)); + break; + case PROP_SHOW_ACCELS: + g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_SHOW_ACCELS, TRUE)); + break; + case PROP_HISTORY_SIZE: + g_value_set_int (value, vinagre_prefs_get_int (prefs, VM_HISTORY_SIZE, 15)); + break; + case PROP_ACTIVE_PLUGINS: + g_value_set_pointer (value, vinagre_prefs_get_list (prefs, VM_ACTIVE_PLUGINS)); + break; + case PROP_LAST_PROTOCOL: + str = vinagre_prefs_get_string (prefs, VM_LAST_PROTOCOL, NULL); + g_value_set_string (value, str); + g_free (str); + break; + case PROP_ALWAYS_ENABLE_LISTENING: + g_value_set_boolean (value, vinagre_prefs_get_bool (prefs, VM_ALWAYS_ENABLE_LISTENING, FALSE)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_prefs_dispose (GObject *object) +{ + VinagrePrefs *prefs = VINAGRE_PREFS (object); + + if (prefs->priv->gconf_client) + { + gconf_client_remove_dir (prefs->priv->gconf_client, + VINAGRE_BASE_KEY, + NULL); + g_object_unref (prefs->priv->gconf_client); + prefs->priv->gconf_client = NULL; + } + + G_OBJECT_CLASS (vinagre_prefs_parent_class)->dispose (object); +} + + +static void +vinagre_prefs_class_init (VinagrePrefsClass *klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS (klass); + GObjectClass* parent_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (VinagrePrefsPrivate)); + + object_class->dispose = vinagre_prefs_dispose; + object_class->set_property = vinagre_prefs_set_property; + object_class->get_property = vinagre_prefs_get_property; + + g_object_class_install_property (object_class, + PROP_SHARED_FLAG, + g_param_spec_boolean ("shared-flag", + "Shared Flag", + "Whether we should share the remote connection", + TRUE, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_ALWAYS_SHOW_TABS, + g_param_spec_boolean ("always-show-tabs", + "Always show tabs", + "Whether we should show the tabs even when there is ony one active connection", + FALSE, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_TOOLBAR_VISIBLE, + g_param_spec_boolean ("toolbar-visible", + "Toolbar Visibility", + "Whether the toolbar is visible", + TRUE, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_STATUSBAR_VISIBLE, + g_param_spec_boolean ("statusbar-visible", + "Statusbar Visibility", + "Whether the statusbar is visible", + TRUE, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_SIDE_PANEL_VISIBLE, + g_param_spec_boolean ("side-panel-visible", + "Side Panel Visibility", + "Whether the side panel is visible", + TRUE, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_WINDOW_STATE, + g_param_spec_int ("window-state", + "Window State", + "Whether the window is maximised", + G_MININT, G_MAXINT, 0, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_WINDOW_WIDTH, + g_param_spec_int ("window-width", + "Window Width", + "The width of window", + 100, G_MAXINT, 650, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_WINDOW_HEIGHT, + g_param_spec_int ("window-height", + "Window Height", + "The height of window", + 100, G_MAXINT, 500, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_SIDE_PANEL_SIZE, + g_param_spec_int ("side-panel-size", + "Side Panel Width", + "The width of side panel", + 100, G_MAXINT, 200, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_SHOW_ACCELS, + g_param_spec_boolean ("show-accels", + "Show menu accelerators", + "Whether we should show the menu accelerators (keyboard shortcuts)", + FALSE, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_HISTORY_SIZE, + g_param_spec_int ("history-size", + "History size", + "Max number of items in history dropdown entry", + 0, G_MAXINT, 15, + G_PARAM_READWRITE)); + + g_object_class_install_property (object_class, + PROP_ACTIVE_PLUGINS, + g_param_spec_pointer ("active-plugins", + "Active plugins", + "The list of active plugins", + G_PARAM_READWRITE)); + + g_object_class_install_property (object_class, + PROP_LAST_PROTOCOL, + g_param_spec_string ("last-protocol", + "Last Protocol", + "The last protocol used in connect dialog", + NULL, + G_PARAM_READWRITE)); + + g_object_class_install_property (object_class, + PROP_ALWAYS_ENABLE_LISTENING, + g_param_spec_boolean ("always-enable-listening", + "Always enable listening", + "Whether we always should listen for reverse connections", + FALSE, + G_PARAM_READWRITE)); + +} + +/* Preferences dialog */ + +typedef struct { + GtkBuilder *xml; + GtkWidget *dialog; + GtkWidget *show_tabs; + GtkWidget *show_accels; +} VinagrePrefsDialog; + +static void +vinagre_prefs_dialog_setup (VinagrePrefsDialog *dialog) +{ + gboolean show_accels, show_tabs; + + g_object_get (vinagre_prefs_get_default (), + "show-accels", &show_accels, + "always-show-tabs", &show_tabs, + NULL); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->show_accels), show_accels); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->show_tabs), show_tabs); +} + +static void +vinagre_prefs_dialog_quit (VinagrePrefsDialog *dialog) +{ + gtk_widget_destroy (dialog->dialog); + g_object_unref (dialog->xml); + g_free (dialog); + dialog = NULL; +} + +static void +vinagre_prefs_dialog_show_tabs_cb (VinagrePrefsDialog *dialog) +{ + g_object_set (vinagre_prefs_get_default (), + "always-show-tabs", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->show_tabs)), + NULL); +} + +static void +vinagre_prefs_dialog_show_accels_cb (VinagrePrefsDialog *dialog) +{ + g_object_set (vinagre_prefs_get_default (), + "show-accels", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->show_accels)), + NULL); +} + +void +vinagre_prefs_dialog_show (VinagreWindow *window) +{ + VinagrePrefsDialog *dialog; + + dialog = g_new (VinagrePrefsDialog, 1); + + dialog->xml = vinagre_utils_get_builder (NULL, NULL); + dialog->dialog = GTK_WIDGET (gtk_builder_get_object (dialog->xml, "preferences_dialog")); + gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog), GTK_WINDOW (window)); + + dialog->show_tabs = GTK_WIDGET (gtk_builder_get_object (dialog->xml, "always_show_tabs_check")); + dialog->show_accels = GTK_WIDGET (gtk_builder_get_object (dialog->xml, "show_accels_check")); + + vinagre_prefs_dialog_setup (dialog); + + g_signal_connect_swapped (dialog->dialog, + "response", + G_CALLBACK (vinagre_prefs_dialog_quit), + dialog); + + g_signal_connect_swapped (dialog->show_tabs, + "toggled", + G_CALLBACK (vinagre_prefs_dialog_show_tabs_cb), + dialog); + + g_signal_connect_swapped (dialog->show_accels, + "toggled", + G_CALLBACK (vinagre_prefs_dialog_show_accels_cb), + dialog); + + gtk_widget_show_all (dialog->dialog); +} +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-prefs.h vinagre-2.29.1/vinagre/vinagre-prefs.h --- vinagre-2.26.1/vinagre/vinagre-prefs.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-prefs.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,59 @@ +/* + * vinagre-prefs.c + * This file is part of vinagre + * + * Copyright (C) Jonh Wendell 2008 + * + * vinagre-prefs.c 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. + * + * vinagre-prefs.c 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. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef _VINAGRE_PREFS_H_ +#define _VINAGRE_PREFS_H_ + +#include +#include "vinagre-window.h" + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_PREFS (vinagre_prefs_get_type ()) +#define VINAGRE_PREFS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_PREFS, VinagrePrefs)) +#define VINAGRE_PREFS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VINAGRE_TYPE_PREFS, VinagrePrefsClass)) +#define VINAGRE_IS_PREFS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VINAGRE_TYPE_PREFS)) +#define VINAGRE_IS_PREFS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_PREFS)) +#define VINAGRE_PREFS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VINAGRE_TYPE_PREFS, VinagrePrefsClass)) + +typedef struct _VinagrePrefsClass VinagrePrefsClass; +typedef struct _VinagrePrefs VinagrePrefs; +typedef struct _VinagrePrefsPrivate VinagrePrefsPrivate; + +struct _VinagrePrefsClass +{ + GObjectClass parent_class; +}; + +struct _VinagrePrefs +{ + GObject parent_instance; + VinagrePrefsPrivate *priv; +}; + +GType vinagre_prefs_get_type (void) G_GNUC_CONST; + +VinagrePrefs *vinagre_prefs_get_default (void); + +void vinagre_prefs_dialog_show (VinagreWindow *window); +G_END_DECLS + +#endif /* _VINAGRE_PREFS_H_ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-spinner.c vinagre-2.29.1/vinagre/vinagre-spinner.c --- vinagre-2.26.1/vinagre/vinagre-spinner.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-spinner.c 2009-08-06 18:41:46.000000000 +0100 @@ -0,0 +1,983 @@ +/* + * vinagre-spinner.c + * This file is part of vinagre + * + * Copyright (C) 2005 - Paolo Maggi + * Copyright (C) 2002-2004 Marco Pesenti Gritti + * Copyright (C) 2004 Christian Persch + * Copyright (C) 2000 - Eazel, Inc. + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * This widget was originally written by Andy Hertzfeld for + * Nautilus. It was then modified by Marco Pesenti Gritti and Christian Persch + * for Epiphany. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "vinagre-spinner.h" + +#include +#include + +/* Spinner cache implementation */ + +#define VINAGRE_TYPE_SPINNER_CACHE (vinagre_spinner_cache_get_type()) +#define VINAGRE_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_CAST((object), VINAGRE_TYPE_SPINNER_CACHE, VinagreSpinnerCache)) +#define VINAGRE_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_SPINNER_CACHE, VinagreSpinnerCacheClass)) +#define VINAGRE_IS_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), VINAGRE_TYPE_SPINNER_CACHE)) +#define VINAGRE_IS_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), VINAGRE_TYPE_SPINNER_CACHE)) +#define VINAGRE_SPINNER_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_SPINNER_CACHE, VinagreSpinnerCacheClass)) + +typedef struct _VinagreSpinnerCache VinagreSpinnerCache; +typedef struct _VinagreSpinnerCacheClass VinagreSpinnerCacheClass; +typedef struct _VinagreSpinnerCachePrivate VinagreSpinnerCachePrivate; + +struct _VinagreSpinnerCacheClass +{ + GObjectClass parent_class; +}; + +struct _VinagreSpinnerCache +{ + GObject parent_object; + + /*< private >*/ + VinagreSpinnerCachePrivate *priv; +}; + +#define VINAGRE_SPINNER_CACHE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_SPINNER_CACHE, VinagreSpinnerCachePrivate)) + +struct _VinagreSpinnerCachePrivate +{ + /* Hash table of GdkScreen -> VinagreSpinnerCacheData */ + GHashTable *hash; +}; + +typedef struct +{ + guint ref_count; + GtkIconSize size; + gint width; + gint height; + GdkPixbuf **animation_pixbufs; + guint n_animation_pixbufs; +} VinagreSpinnerImages; + +#define LAST_ICON_SIZE GTK_ICON_SIZE_DIALOG + 1 +#define SPINNER_ICON_NAME "process-working" +#define SPINNER_FALLBACK_ICON_NAME "gnome-spinner" +#define VINAGRE_SPINNER_IMAGES_INVALID ((VinagreSpinnerImages *) 0x1) + +typedef struct +{ + GdkScreen *screen; + GtkIconTheme *icon_theme; + VinagreSpinnerImages *images[LAST_ICON_SIZE]; +} VinagreSpinnerCacheData; + +static void vinagre_spinner_cache_class_init (VinagreSpinnerCacheClass *klass); +static void vinagre_spinner_cache_init (VinagreSpinnerCache *cache); + +static GObjectClass *vinagre_spinner_cache_parent_class; + +static GType +vinagre_spinner_cache_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) + { + const GTypeInfo our_info = + { + sizeof (VinagreSpinnerCacheClass), + NULL, + NULL, + (GClassInitFunc) vinagre_spinner_cache_class_init, + NULL, + NULL, + sizeof (VinagreSpinnerCache), + 0, + (GInstanceInitFunc) vinagre_spinner_cache_init + }; + + type = g_type_register_static (G_TYPE_OBJECT, + "VinagreSpinnerCache", + &our_info, 0); + } + + return type; +} + +static VinagreSpinnerImages * +vinagre_spinner_images_ref (VinagreSpinnerImages *images) +{ + g_return_val_if_fail (images != NULL, NULL); + + images->ref_count++; + + return images; +} + +static void +vinagre_spinner_images_unref (VinagreSpinnerImages *images) +{ + g_return_if_fail (images != NULL); + + images->ref_count--; + if (images->ref_count == 0) + { + guint i; + + /* LOG ("Freeing spinner images %p for size %d", images, images->size); */ + + for (i = 0; i < images->n_animation_pixbufs; ++i) + { + g_object_unref (images->animation_pixbufs[i]); + } + g_free (images->animation_pixbufs); + + g_free (images); + } +} + +static void +vinagre_spinner_cache_data_unload (VinagreSpinnerCacheData *data) +{ + GtkIconSize size; + VinagreSpinnerImages *images; + + g_return_if_fail (data != NULL); + + /* LOG ("VinagreSpinnerDataCache unload for screen %p", data->screen); */ + + for (size = GTK_ICON_SIZE_INVALID; size < LAST_ICON_SIZE; ++size) + { + images = data->images[size]; + data->images[size] = NULL; + + if (images != NULL && images != VINAGRE_SPINNER_IMAGES_INVALID) + { + vinagre_spinner_images_unref (images); + } + } +} + +static GdkPixbuf * +extract_frame (GdkPixbuf *grid_pixbuf, + int x, + int y, + int size) +{ + GdkPixbuf *pixbuf; + + if (x + size > gdk_pixbuf_get_width (grid_pixbuf) || + y + size > gdk_pixbuf_get_height (grid_pixbuf)) + { + return NULL; + } + + pixbuf = gdk_pixbuf_new_subpixbuf (grid_pixbuf, + x, y, + size, size); + g_return_val_if_fail (pixbuf != NULL, NULL); + + return pixbuf; +} + +static GdkPixbuf * +scale_to_size (GdkPixbuf *pixbuf, + int dw, + int dh) +{ + GdkPixbuf *result; + int pw, ph; + + g_return_val_if_fail (pixbuf != NULL, NULL); + + pw = gdk_pixbuf_get_width (pixbuf); + ph = gdk_pixbuf_get_height (pixbuf); + + if (pw != dw || ph != dh) + { + result = gdk_pixbuf_scale_simple (pixbuf, dw, dh, + GDK_INTERP_BILINEAR); + g_object_unref (pixbuf); + return result; + } + + return pixbuf; +} + +static VinagreSpinnerImages * +vinagre_spinner_images_load (GdkScreen *screen, + GtkIconTheme *icon_theme, + GtkIconSize icon_size) +{ + VinagreSpinnerImages *images; + GdkPixbuf *icon_pixbuf, *pixbuf; + GtkIconInfo *icon_info = NULL; + int grid_width, grid_height, x, y, requested_size, size, isw, ish, n; + const char *icon; + GSList *list = NULL, *l; + + /* LOG ("VinagreSpinnerCacheData loading for screen %p at size %d", screen, icon_size); */ + + /* START_PROFILER ("loading spinner animation") */ + + if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen), + icon_size, &isw, &ish)) + goto loser; + + requested_size = MAX (ish, isw); + + /* Load the animation. The 'rest icon' is the 0th frame */ + icon_info = gtk_icon_theme_lookup_icon (icon_theme, + SPINNER_ICON_NAME, + requested_size, 0); + if (icon_info == NULL) + { + g_warning ("Throbber animation not found"); + + /* If the icon naming spec compliant name wasn't found, try the old name */ + icon_info = gtk_icon_theme_lookup_icon (icon_theme, + SPINNER_FALLBACK_ICON_NAME, + requested_size, 0); + if (icon_info == NULL) + { + g_warning ("Throbber fallback animation not found either"); + goto loser; + } + } + + g_assert (icon_info != NULL); + + size = gtk_icon_info_get_base_size (icon_info); + icon = gtk_icon_info_get_filename (icon_info); + + if (icon == NULL) + goto loser; + + icon_pixbuf = gdk_pixbuf_new_from_file (icon, NULL); + gtk_icon_info_free (icon_info); + icon_info = NULL; + + if (icon_pixbuf == NULL) + { + g_warning ("Could not load the spinner file"); + goto loser; + } + + grid_width = gdk_pixbuf_get_width (icon_pixbuf); + grid_height = gdk_pixbuf_get_height (icon_pixbuf); + + n = 0; + for (y = 0; y < grid_height; y += size) + { + for (x = 0; x < grid_width ; x += size) + { + pixbuf = extract_frame (icon_pixbuf, x, y, size); + + if (pixbuf) + { + list = g_slist_prepend (list, pixbuf); + ++n; + } + else + { + g_warning ("Cannot extract frame (%d, %d) from the grid\n", x, y); + } + } + } + + g_object_unref (icon_pixbuf); + + if (list == NULL) + goto loser; + + /* g_assert (n > 0); */ + + if (size > requested_size) + { + for (l = list; l != NULL; l = l->next) + { + l->data = scale_to_size (l->data, isw, ish); + } + } + + /* Now we've successfully got all the data */ + images = g_new (VinagreSpinnerImages, 1); + images->ref_count = 1; + + images->size = icon_size; + images->width = images->height = requested_size; + + images->n_animation_pixbufs = n; + images->animation_pixbufs = g_new (GdkPixbuf *, n); + + for (l = list; l != NULL; l = l->next) + { + g_assert (l->data != NULL); + images->animation_pixbufs[--n] = l->data; + } + g_assert (n == 0); + + g_slist_free (list); + + /* STOP_PROFILER ("loading spinner animation") */ + return images; + +loser: + if (icon_info) + { + gtk_icon_info_free (icon_info); + } + + g_slist_foreach (list, (GFunc) g_object_unref, NULL); + + /* STOP_PROFILER ("loading spinner animation") */ + + return NULL; +} + +static VinagreSpinnerCacheData * +vinagre_spinner_cache_data_new (GdkScreen *screen) +{ + VinagreSpinnerCacheData *data; + + data = g_new0 (VinagreSpinnerCacheData, 1); + + data->screen = screen; + data->icon_theme = gtk_icon_theme_get_for_screen (screen); + g_signal_connect_swapped (data->icon_theme, + "changed", + G_CALLBACK (vinagre_spinner_cache_data_unload), + data); + + return data; +} + +static void +vinagre_spinner_cache_data_free (VinagreSpinnerCacheData *data) +{ + g_return_if_fail (data != NULL); + g_return_if_fail (data->icon_theme != NULL); + + g_signal_handlers_disconnect_by_func (data->icon_theme, + G_CALLBACK (vinagre_spinner_cache_data_unload), + data); + + vinagre_spinner_cache_data_unload (data); + + g_free (data); +} + +static VinagreSpinnerImages * +vinagre_spinner_cache_get_images (VinagreSpinnerCache *cache, + GdkScreen *screen, + GtkIconSize icon_size) +{ + VinagreSpinnerCachePrivate *priv = cache->priv; + VinagreSpinnerCacheData *data; + VinagreSpinnerImages *images; + + /* LOG ("Getting animation images for screen %p at size %d", screen, icon_size); */ + + g_return_val_if_fail (icon_size >= 0 && icon_size < LAST_ICON_SIZE, NULL); + + /* Backward compat: "invalid" meant "native" size which doesn't exist anymore */ + if (icon_size == GTK_ICON_SIZE_INVALID) + { + icon_size = GTK_ICON_SIZE_DIALOG; + } + + data = g_hash_table_lookup (priv->hash, screen); + if (data == NULL) + { + data = vinagre_spinner_cache_data_new (screen); + /* FIXME: think about what happens when the screen's display is closed later on */ + g_hash_table_insert (priv->hash, screen, data); + } + + images = data->images[icon_size]; + if (images == VINAGRE_SPINNER_IMAGES_INVALID) + { + /* Load failed, but don't try endlessly again! */ + return NULL; + } + + if (images != NULL) + { + /* Return cached data */ + return vinagre_spinner_images_ref (images); + } + + images = vinagre_spinner_images_load (screen, data->icon_theme, icon_size); + + if (images == NULL) + { + /* Mark as failed-to-load */ + data->images[icon_size] = VINAGRE_SPINNER_IMAGES_INVALID; + + return NULL; + } + + data->images[icon_size] = images; + + return vinagre_spinner_images_ref (images); +} + +static void +vinagre_spinner_cache_init (VinagreSpinnerCache *cache) +{ + VinagreSpinnerCachePrivate *priv; + + priv = cache->priv = VINAGRE_SPINNER_CACHE_GET_PRIVATE (cache); + + /* LOG ("VinagreSpinnerCache initialising"); */ + + priv->hash = g_hash_table_new_full (g_direct_hash, + g_direct_equal, + NULL, + (GDestroyNotify) vinagre_spinner_cache_data_free); +} + +static void +vinagre_spinner_cache_finalize (GObject *object) +{ + VinagreSpinnerCache *cache = VINAGRE_SPINNER_CACHE (object); + VinagreSpinnerCachePrivate *priv = cache->priv; + + g_hash_table_destroy (priv->hash); + + /* LOG ("VinagreSpinnerCache finalised"); */ + + G_OBJECT_CLASS (vinagre_spinner_cache_parent_class)->finalize (object); +} + +static void +vinagre_spinner_cache_class_init (VinagreSpinnerCacheClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + vinagre_spinner_cache_parent_class = g_type_class_peek_parent (klass); + + object_class->finalize = vinagre_spinner_cache_finalize; + + g_type_class_add_private (object_class, sizeof (VinagreSpinnerCachePrivate)); +} + +static VinagreSpinnerCache *spinner_cache = NULL; + +static VinagreSpinnerCache * +vinagre_spinner_cache_ref (void) +{ + if (spinner_cache == NULL) + { + VinagreSpinnerCache **cache_ptr; + + spinner_cache = g_object_new (VINAGRE_TYPE_SPINNER_CACHE, NULL); + cache_ptr = &spinner_cache; + g_object_add_weak_pointer (G_OBJECT (spinner_cache), + (gpointer *) cache_ptr); + + return spinner_cache; + } + + return g_object_ref (spinner_cache); +} + +/* Spinner implementation */ + +#define SPINNER_TIMEOUT 125 /* ms */ + +#define VINAGRE_SPINNER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_SPINNER, VinagreSpinnerPrivate)) + +struct _VinagreSpinnerPrivate +{ + GtkIconTheme *icon_theme; + VinagreSpinnerCache *cache; + GtkIconSize size; + VinagreSpinnerImages *images; + guint current_image; + guint timeout; + guint timer_task; + guint spinning : 1; + guint need_load : 1; +}; + +static void vinagre_spinner_class_init (VinagreSpinnerClass *class); +static void vinagre_spinner_init (VinagreSpinner *spinner); + +static GObjectClass *parent_class; + +GType +vinagre_spinner_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) + { + const GTypeInfo our_info = + { + sizeof (VinagreSpinnerClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) vinagre_spinner_class_init, + NULL, + NULL, /* class_data */ + sizeof (VinagreSpinner), + 0, /* n_preallocs */ + (GInstanceInitFunc) vinagre_spinner_init + }; + + type = g_type_register_static (GTK_TYPE_WIDGET, + "VinagreSpinner", + &our_info, 0); + } + + return type; +} + +static gboolean +vinagre_spinner_load_images (VinagreSpinner *spinner) +{ + VinagreSpinnerPrivate *priv = spinner->priv; + + if (priv->need_load) + { + /* START_PROFILER ("vinagre_spinner_load_images") */ + + priv->images = + vinagre_spinner_cache_get_images (priv->cache, + gtk_widget_get_screen (GTK_WIDGET (spinner)), + priv->size); + + /* STOP_PROFILER ("vinagre_spinner_load_images") */ + + priv->current_image = 0; /* 'rest' icon */ + priv->need_load = FALSE; + } + + return priv->images != NULL; +} + +static void +vinagre_spinner_unload_images (VinagreSpinner *spinner) +{ + VinagreSpinnerPrivate *priv = spinner->priv; + + if (priv->images != NULL) + { + vinagre_spinner_images_unref (priv->images); + priv->images = NULL; + } + + priv->current_image = 0; + priv->need_load = TRUE; +} + +static void +icon_theme_changed_cb (GtkIconTheme *icon_theme, + VinagreSpinner *spinner) +{ + vinagre_spinner_unload_images (spinner); + gtk_widget_queue_resize (GTK_WIDGET (spinner)); +} + +static void +vinagre_spinner_init (VinagreSpinner *spinner) +{ + VinagreSpinnerPrivate *priv; + + priv = spinner->priv = VINAGRE_SPINNER_GET_PRIVATE (spinner); + + GTK_WIDGET_SET_FLAGS (GTK_WIDGET (spinner), GTK_NO_WINDOW); + + priv->cache = vinagre_spinner_cache_ref (); + priv->size = GTK_ICON_SIZE_DIALOG; + priv->spinning = FALSE; + priv->timeout = SPINNER_TIMEOUT; + priv->need_load = TRUE; +} + +static int +vinagre_spinner_expose (GtkWidget *widget, + GdkEventExpose *event) +{ + VinagreSpinner *spinner = VINAGRE_SPINNER (widget); + VinagreSpinnerPrivate *priv = spinner->priv; + VinagreSpinnerImages *images; + GdkPixbuf *pixbuf; + GdkGC *gc; + int x_offset, y_offset, width, height; + GdkRectangle pix_area, dest; + + if (!GTK_WIDGET_DRAWABLE (spinner)) + { + return FALSE; + } + + if (priv->need_load && + !vinagre_spinner_load_images (spinner)) + { + return FALSE; + } + + images = priv->images; + if (images == NULL) + { + return FALSE; + } + + /* Otherwise |images| will be NULL anyway */ + g_assert (images->n_animation_pixbufs > 0); + + g_assert (priv->current_image >= 0 && + priv->current_image < images->n_animation_pixbufs); + + pixbuf = images->animation_pixbufs[priv->current_image]; + + g_assert (pixbuf != NULL); + + width = gdk_pixbuf_get_width (pixbuf); + height = gdk_pixbuf_get_height (pixbuf); + + /* Compute the offsets for the image centered on our allocation */ + x_offset = (widget->allocation.width - width) / 2; + y_offset = (widget->allocation.height - height) / 2; + + pix_area.x = x_offset + widget->allocation.x; + pix_area.y = y_offset + widget->allocation.y; + pix_area.width = width; + pix_area.height = height; + + if (!gdk_rectangle_intersect (&event->area, &pix_area, &dest)) + { + return FALSE; + } + + gc = gdk_gc_new (widget->window); + gdk_draw_pixbuf (widget->window, gc, pixbuf, + dest.x - x_offset - widget->allocation.x, + dest.y - y_offset - widget->allocation.y, + dest.x, dest.y, + dest.width, dest.height, + GDK_RGB_DITHER_MAX, 0, 0); + g_object_unref (gc); + + return FALSE; +} + +static gboolean +bump_spinner_frame_cb (VinagreSpinner *spinner) +{ + VinagreSpinnerPrivate *priv = spinner->priv; + + /* This can happen when we've unloaded the images on a theme + * change, but haven't been in the queued size request yet. + * Just skip this update. + */ + if (priv->images == NULL) + return TRUE; + + priv->current_image++; + if (priv->current_image >= priv->images->n_animation_pixbufs) + { + /* the 0th frame is the 'rest' icon */ + priv->current_image = MIN (1, priv->images->n_animation_pixbufs); + } + + gtk_widget_queue_draw (GTK_WIDGET (spinner)); + + /* run again */ + return TRUE; +} + +/** + * vinagre_spinner_start: + * @spinner: a #VinagreSpinner + * + * Start the spinner animation. + **/ +void +vinagre_spinner_start (VinagreSpinner *spinner) +{ + VinagreSpinnerPrivate *priv = spinner->priv; + + priv->spinning = TRUE; + + if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner)) && + priv->timer_task == 0 && + vinagre_spinner_load_images (spinner)) + { + /* the 0th frame is the 'rest' icon */ + priv->current_image = MIN (1, priv->images->n_animation_pixbufs); + + priv->timer_task = g_timeout_add_full (G_PRIORITY_LOW, + priv->timeout, + (GSourceFunc) bump_spinner_frame_cb, + spinner, + NULL); + } +} + +static void +vinagre_spinner_remove_update_callback (VinagreSpinner *spinner) +{ + VinagreSpinnerPrivate *priv = spinner->priv; + + if (priv->timer_task != 0) + { + g_source_remove (priv->timer_task); + priv->timer_task = 0; + } +} + +/** + * vinagre_spinner_stop: + * @spinner: a #VinagreSpinner + * + * Stop the spinner animation. + **/ +void +vinagre_spinner_stop (VinagreSpinner *spinner) +{ + VinagreSpinnerPrivate *priv = spinner->priv; + + priv->spinning = FALSE; + priv->current_image = 0; + + if (priv->timer_task != 0) + { + vinagre_spinner_remove_update_callback (spinner); + + if (GTK_WIDGET_MAPPED (GTK_WIDGET (spinner))) + gtk_widget_queue_draw (GTK_WIDGET (spinner)); + } +} + +/* + * vinagre_spinner_set_size: + * @spinner: a #VinagreSpinner + * @size: the size of type %GtkIconSize + * + * Set the size of the spinner. + **/ +void +vinagre_spinner_set_size (VinagreSpinner *spinner, + GtkIconSize size) +{ + if (size == GTK_ICON_SIZE_INVALID) + { + size = GTK_ICON_SIZE_DIALOG; + } + + if (size != spinner->priv->size) + { + vinagre_spinner_unload_images (spinner); + + spinner->priv->size = size; + + gtk_widget_queue_resize (GTK_WIDGET (spinner)); + } +} + +#if 0 +/* +* vinagre_spinner_set_timeout: +* @spinner: a #VinagreSpinner +* @timeout: time delay between updates to the spinner. +* +* Sets the timeout delay for spinner updates. +**/ +void +vinagre_spinner_set_timeout (VinagreSpinner *spinner, + guint timeout) +{ + VinagreSpinnerPrivate *priv = spinner->priv; + + if (timeout != priv->timeout) + { + vinagre_spinner_stop (spinner); + + priv->timeout = timeout; + + if (priv->spinning) + { + vinagre_spinner_start (spinner); + } + } +} +#endif + +static void +vinagre_spinner_size_request (GtkWidget *widget, + GtkRequisition *requisition) +{ + VinagreSpinner *spinner = VINAGRE_SPINNER (widget); + VinagreSpinnerPrivate *priv = spinner->priv; + + if ((priv->need_load && + !vinagre_spinner_load_images (spinner)) || + priv->images == NULL) + { + requisition->width = requisition->height = 0; + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget), + priv->size, + &requisition->width, + &requisition->height); + return; + } + + requisition->width = priv->images->width; + requisition->height = priv->images->height; + + /* FIXME fix this hack */ + /* allocate some extra margin so we don't butt up against toolbar edges */ + if (priv->size != GTK_ICON_SIZE_MENU) + { + requisition->width += 2; + requisition->height += 2; + } +} + +static void +vinagre_spinner_map (GtkWidget *widget) +{ + VinagreSpinner *spinner = VINAGRE_SPINNER (widget); + VinagreSpinnerPrivate *priv = spinner->priv; + + GTK_WIDGET_CLASS (parent_class)->map (widget); + + if (priv->spinning) + { + vinagre_spinner_start (spinner); + } +} + +static void +vinagre_spinner_unmap (GtkWidget *widget) +{ + VinagreSpinner *spinner = VINAGRE_SPINNER (widget); + + vinagre_spinner_remove_update_callback (spinner); + + GTK_WIDGET_CLASS (parent_class)->unmap (widget); +} + +static void +vinagre_spinner_dispose (GObject *object) +{ + VinagreSpinner *spinner = VINAGRE_SPINNER (object); + + g_signal_handlers_disconnect_by_func + (spinner->priv->icon_theme, + G_CALLBACK (icon_theme_changed_cb), spinner); + + G_OBJECT_CLASS (parent_class)->dispose (object); +} + +static void +vinagre_spinner_finalize (GObject *object) +{ + VinagreSpinner *spinner = VINAGRE_SPINNER (object); + + vinagre_spinner_remove_update_callback (spinner); + vinagre_spinner_unload_images (spinner); + + g_object_unref (spinner->priv->cache); + + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static void +vinagre_spinner_screen_changed (GtkWidget *widget, + GdkScreen *old_screen) +{ + VinagreSpinner *spinner = VINAGRE_SPINNER (widget); + VinagreSpinnerPrivate *priv = spinner->priv; + GdkScreen *screen; + + if (GTK_WIDGET_CLASS (parent_class)->screen_changed) + { + GTK_WIDGET_CLASS (parent_class)->screen_changed (widget, old_screen); + } + + screen = gtk_widget_get_screen (widget); + + /* FIXME: this seems to be happening when then spinner is destroyed!? */ + if (old_screen == screen) + return; + + /* We'll get mapped again on the new screen, but not unmapped from + * the old screen, so remove timeout here. + */ + vinagre_spinner_remove_update_callback (spinner); + + vinagre_spinner_unload_images (spinner); + + if (old_screen != NULL) + { + g_signal_handlers_disconnect_by_func + (gtk_icon_theme_get_for_screen (old_screen), + G_CALLBACK (icon_theme_changed_cb), spinner); + } + + priv->icon_theme = gtk_icon_theme_get_for_screen (screen); + g_signal_connect (priv->icon_theme, "changed", + G_CALLBACK (icon_theme_changed_cb), spinner); +} + +static void +vinagre_spinner_class_init (VinagreSpinnerClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); + + parent_class = g_type_class_peek_parent (class); + + object_class->dispose = vinagre_spinner_dispose; + object_class->finalize = vinagre_spinner_finalize; + + widget_class->expose_event = vinagre_spinner_expose; + widget_class->size_request = vinagre_spinner_size_request; + widget_class->map = vinagre_spinner_map; + widget_class->unmap = vinagre_spinner_unmap; + widget_class->screen_changed = vinagre_spinner_screen_changed; + + g_type_class_add_private (object_class, sizeof (VinagreSpinnerPrivate)); +} + +/* + * vinagre_spinner_new: + * + * Create a new #VinagreSpinner. The spinner is a widget + * that gives the user feedback about network status with + * an animated image. + * + * Return Value: the spinner #GtkWidget + **/ +GtkWidget * +vinagre_spinner_new (void) +{ + return GTK_WIDGET (g_object_new (VINAGRE_TYPE_SPINNER, NULL)); +} diff -Nru vinagre-2.26.1/vinagre/vinagre-spinner.h vinagre-2.29.1/vinagre/vinagre-spinner.h --- vinagre-2.26.1/vinagre/vinagre-spinner.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-spinner.h 2009-08-06 18:41:35.000000000 +0100 @@ -0,0 +1,89 @@ +/* + * vinagre-spinner.h + * This file is part of vinagre + * + * Copyright (C) 2005 - Paolo Maggi + * Copyright (C) 2000 - Eazel, Inc. + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * This widget was originally written by Andy Hertzfeld for + * Nautilus. + */ + +#ifndef __VINAGRE_SPINNER_H__ +#define __VINAGRE_SPINNER_H__ + +#include + +G_BEGIN_DECLS + +/* + * Type checking and casting macros + */ +#define VINAGRE_TYPE_SPINNER (vinagre_spinner_get_type ()) +#define VINAGRE_SPINNER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), VINAGRE_TYPE_SPINNER, VinagreSpinner)) +#define VINAGRE_SPINNER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), VINAGRE_TYPE_SPINNER, VinagreSpinnerClass)) +#define VINAGRE_IS_SPINNER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), VINAGRE_TYPE_SPINNER)) +#define VINAGRE_IS_SPINNER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), VINAGRE_TYPE_SPINNER)) +#define VINAGRE_SPINNER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), VINAGRE_TYPE_SPINNER, VinagreSpinnerClass)) + + +/* Private structure type */ +typedef struct _VinagreSpinnerPrivate VinagreSpinnerPrivate; + +/* + * Main object structure + */ +typedef struct _VinagreSpinner VinagreSpinner; + +struct _VinagreSpinner +{ + GtkWidget parent; + + /*< private >*/ + VinagreSpinnerPrivate *priv; +}; + +/* + * Class definition + */ +typedef struct _VinagreSpinnerClass VinagreSpinnerClass; + +struct _VinagreSpinnerClass +{ + GtkWidgetClass parent_class; +}; + +/* + * Public methods + */ +GType vinagre_spinner_get_type (void) G_GNUC_CONST; + +GtkWidget *vinagre_spinner_new (void); + +void vinagre_spinner_start (VinagreSpinner *throbber); + +void vinagre_spinner_stop (VinagreSpinner *throbber); + +void vinagre_spinner_set_size (VinagreSpinner *spinner, + GtkIconSize size); + +G_END_DECLS + +#endif /* __VINAGRE_SPINNER_H__ */ diff -Nru vinagre-2.26.1/vinagre/vinagre-tab.c vinagre-2.29.1/vinagre/vinagre-tab.c --- vinagre-2.26.1/vinagre/vinagre-tab.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-tab.c 2009-10-19 12:22:07.000000000 +0100 @@ -0,0 +1,952 @@ +/* + * vinagre-tab.c + * Abstract base class for all types of tabs: VNC, RDP, etc. + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include "vinagre-tab.h" +#include "vinagre-notebook.h" +#include "vinagre-utils.h" +#include "vinagre-prefs.h" +#include "view/autoDrawer.h" +#include "vinagre-plugin.h" +#include "vinagre-plugins-engine.h" + +#define VINAGRE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_TAB, VinagreTabPrivate)) + +struct _VinagreTabPrivate +{ + GtkWidget *view; + GtkWidget *scroll; + VinagreConnection *conn; + VinagreNotebook *nb; + VinagreWindow *window; + gboolean save_credentials; + guint32 keyring_item_id; + VinagreTabState state; + GtkWidget *layout; + GtkWidget *toolbar; +}; + +G_DEFINE_ABSTRACT_TYPE (VinagreTab, vinagre_tab, GTK_TYPE_VBOX) + +/* Signals */ +enum +{ + TAB_CONNECTED, + TAB_DISCONNECTED, + TAB_INITIALIZED, + TAB_AUTH_FAILED, + LAST_SIGNAL +}; + +/* Properties */ +enum +{ + PROP_0, + PROP_CONN, + PROP_WINDOW, + PROP_TOOLTIP +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +static gboolean +vinagre_tab_window_state_cb (GtkWidget *widget, + GdkEventWindowState *event, + VinagreTab *tab) +{ + int view_w, view_h, screen_w, screen_h; + GdkScreen *screen; + GtkPolicyType h, v; + + if ((event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) == 0) + return FALSE; + + vinagre_tab_get_dimensions (tab, &view_w, &view_h); + + screen = gtk_widget_get_screen (GTK_WIDGET (tab)); + screen_w = gdk_screen_get_width (screen); + screen_h = gdk_screen_get_height (screen); + + if (view_w <= screen_w) + h = GTK_POLICY_NEVER; + else + h = GTK_POLICY_AUTOMATIC; + + if (view_h <= screen_h) + v = GTK_POLICY_NEVER; + else + v = GTK_POLICY_AUTOMATIC; + + if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) + { + gtk_widget_show (tab->priv->toolbar); + ViewAutoDrawer_SetActive (VIEW_AUTODRAWER (tab->priv->layout), TRUE); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tab->priv->scroll), + h, v); + } + else + { + gtk_widget_hide (tab->priv->toolbar); + ViewAutoDrawer_SetActive (VIEW_AUTODRAWER (tab->priv->layout), FALSE); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tab->priv->scroll), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + vinagre_notebook_show_hide_tabs (tab->priv->nb); + } + + return FALSE; +} + +static void +vinagre_tab_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + VinagreTab *tab = VINAGRE_TAB (object); + + switch (prop_id) + { + case PROP_CONN: + g_value_set_object (value, tab->priv->conn); + break; + case PROP_WINDOW: + g_value_set_object (value, tab->priv->window); + break; + case PROP_TOOLTIP: + g_value_take_string (value, vinagre_tab_get_tooltip (tab)); + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_tab_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + VinagreTab *tab = VINAGRE_TAB (object); + + switch (prop_id) + { + case PROP_CONN: + tab->priv->conn = g_value_dup_object (value); + g_object_set_data (G_OBJECT (tab->priv->conn), VINAGRE_TAB_KEY, tab); + break; + case PROP_WINDOW: + tab->priv->window = g_value_get_object (value); + g_signal_connect (tab->priv->window, + "window-state-event", + G_CALLBACK (vinagre_tab_window_state_cb), + tab); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_tab_dispose (GObject *object) +{ + VinagreTab *tab = VINAGRE_TAB (object); + + if (tab->priv->conn) + { + g_signal_handlers_disconnect_by_func (tab->priv->window, + vinagre_tab_window_state_cb, + tab); + g_object_unref (tab->priv->conn); + tab->priv->conn = NULL; + } + + G_OBJECT_CLASS (vinagre_tab_parent_class)->dispose (object); +} + +void +default_get_dimensions (VinagreTab *tab, int *w, int *h) +{ + *w = -1; + *h = -1; +} + +const GSList * +default_get_always_sensitive_actions (VinagreTab *tab) +{ + return NULL; +} + +const GSList * +default_get_connected_actions (VinagreTab *tab) +{ + return NULL; +} + +const GSList * +default_get_initialized_actions (VinagreTab *tab) +{ + return NULL; +} + +gchar * +default_get_extra_title (VinagreTab *tab) +{ + return NULL; +} + +static void +menu_position (GtkMenu *menu, + gint *x, + gint *y, + gboolean *push_in, + VinagreTab *tab) +{ + int width, height; + GdkWindow *window; + + window = gtk_widget_get_window (tab->priv->toolbar); + + gdk_window_get_origin (window, x, y); + gdk_drawable_get_size (window, &width, &height); + + *push_in = TRUE; + *y += height; +} + +static void +open_connection_cb (GtkMenuItem *item, + VinagreTab *tab) +{ + vinagre_window_set_active_tab (tab->priv->window, tab); +} + +static void +active_connections_button_clicked (GtkToolButton *button, + VinagreTab *tab) +{ + GSList *connections, *l; + VinagrePlugin *plugin; + VinagreConnection *conn; + GtkWidget *menu, *item, *image; + gchar *str, *label; + + menu = gtk_menu_new (); + + connections = vinagre_notebook_get_tabs (tab->priv->nb); + for (l = connections; l; l = l->next) + { + conn = VINAGRE_TAB (l->data)->priv->conn; + plugin = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), + vinagre_connection_get_protocol (conn)); + item = gtk_image_menu_item_new_with_label (""); + image = gtk_image_new_from_icon_name (vinagre_plugin_get_icon_name (plugin), + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + + label = vinagre_connection_get_best_name (conn); + if ((l->data == tab) && (GTK_IS_LABEL (GTK_BIN (item)->child))) + { + str = g_strdup_printf ("%s", label); + gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (item)->child), TRUE); + g_free (label); + label = str; + } + gtk_menu_item_set_label (GTK_MENU_ITEM (item), label); + g_free (label); + + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + g_signal_connect (item, "activate", G_CALLBACK (open_connection_cb), l->data); + } + + gtk_widget_show_all (menu); + gtk_menu_popup (GTK_MENU (menu), + NULL, + NULL, + (GtkMenuPositionFunc) menu_position, + tab, + 0, + gtk_get_current_event_time ()); +} + +static void +close_button_clicked (GtkToolButton *button, + VinagreTab *tab) +{ + vinagre_notebook_close_tab (tab->priv->nb, tab); +} + +static void +fullscreen_button_clicked (GtkToolButton *button, + VinagreTab *tab) +{ + vinagre_window_toggle_fullscreen (tab->priv->window); +} + +static void +setup_layout (VinagreTab *tab) +{ + GtkWidget *button; + gchar *str; + + tab->priv->toolbar = gtk_toolbar_new (); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (tab->priv->toolbar), FALSE); + GTK_WIDGET_SET_FLAGS (tab->priv->toolbar, GTK_NO_SHOW_ALL); + + gtk_toolbar_set_style (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOLBAR_BOTH_HORIZ); + + /* Close connection */ + button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE)); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Close connection")); + gtk_widget_show (GTK_WIDGET (button)); + gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); + g_signal_connect (button, "clicked", G_CALLBACK (close_button_clicked), tab); + + /* Connection name/menu */ + str = vinagre_connection_get_best_name (tab->priv->conn); + button = GTK_WIDGET (gtk_tool_button_new (NULL, str)); + g_free (str); + + str = vinagre_connection_get_string_rep (tab->priv->conn, TRUE); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), str); + g_free (str); + + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (button), TRUE); + g_signal_connect (button, "clicked", G_CALLBACK (active_connections_button_clicked), tab); + gtk_widget_show (GTK_WIDGET (button)); + gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); + + /* Leave fullscreen */ + button = GTK_WIDGET (gtk_tool_button_new_from_stock (GTK_STOCK_LEAVE_FULLSCREEN)); + gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (button), _("Leave fullscreen")); + gtk_widget_show (GTK_WIDGET (button)); + gtk_toolbar_insert (GTK_TOOLBAR (tab->priv->toolbar), GTK_TOOL_ITEM (button), 0); + g_signal_connect (button, "clicked", G_CALLBACK (fullscreen_button_clicked), tab); + + tab->priv->layout = ViewAutoDrawer_New (); + ViewAutoDrawer_SetActive (VIEW_AUTODRAWER (tab->priv->layout), FALSE); + ViewOvBox_SetOver (VIEW_OV_BOX (tab->priv->layout), tab->priv->toolbar); + ViewOvBox_SetUnder (VIEW_OV_BOX (tab->priv->layout), tab->priv->scroll); + ViewAutoDrawer_SetOffset (VIEW_AUTODRAWER (tab->priv->layout), -1); + ViewAutoDrawer_SetFill (VIEW_AUTODRAWER (tab->priv->layout), FALSE); + + gtk_box_pack_end (GTK_BOX(tab), tab->priv->layout, TRUE, TRUE, 0); + gtk_widget_show_all (GTK_WIDGET (tab)); +} + +static void +vinagre_tab_constructed (GObject *object) +{ + VinagreTab *tab = VINAGRE_TAB (object); + + if (G_OBJECT_CLASS (vinagre_tab_parent_class)->constructed) + G_OBJECT_CLASS (vinagre_tab_parent_class)->constructed (object); + + setup_layout (tab); +} + +static void +vinagre_tab_class_init (VinagreTabClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = vinagre_tab_dispose; + object_class->get_property = vinagre_tab_get_property; + object_class->set_property = vinagre_tab_set_property; + object_class->constructed = vinagre_tab_constructed; + + klass->impl_get_tooltip = NULL; + klass->impl_get_screenshot = NULL; + klass->impl_get_dimensions = default_get_dimensions; + klass->impl_get_always_sensitive_actions = default_get_always_sensitive_actions; + klass->impl_get_connected_actions = default_get_connected_actions; + klass->impl_get_initialized_actions = default_get_initialized_actions; + klass->impl_get_extra_title = default_get_extra_title; + + g_object_class_install_property (object_class, + PROP_CONN, + g_param_spec_object ("conn", + "Connection", + "The connection", + VINAGRE_TYPE_CONNECTION, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + g_object_class_install_property (object_class, + PROP_WINDOW, + g_param_spec_object ("window", + "Window", + "The VinagreWindow", + VINAGRE_TYPE_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property (object_class, + PROP_TOOLTIP, + g_param_spec_string ("tooltip", + "Tooltip", + "The tooltip of this tab", + NULL, + G_PARAM_READABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + signals[TAB_CONNECTED] = + g_signal_new ("tab-connected", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (VinagreTabClass, tab_connected), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + signals[TAB_DISCONNECTED] = + g_signal_new ("tab-disconnected", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (VinagreTabClass, tab_disconnected), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + signals[TAB_INITIALIZED] = + g_signal_new ("tab-initialized", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (VinagreTabClass, tab_initialized), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + signals[TAB_AUTH_FAILED] = + g_signal_new ("tab-auth-failed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (VinagreTabClass, tab_auth_failed), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, + 1, + G_TYPE_STRING); + + g_type_class_add_private (object_class, sizeof (VinagreTabPrivate)); +} + +void +vinagre_tab_add_recent_used (VinagreTab *tab) +{ + GtkRecentManager *manager; + GtkRecentData *data; + gchar *uri; + + static gchar *groups[2] = { + "vinagre", + NULL + }; + + manager = gtk_recent_manager_get_default (); + data = g_slice_new (GtkRecentData); + + uri = vinagre_connection_get_string_rep (tab->priv->conn, TRUE); + data->display_name = vinagre_connection_get_best_name (tab->priv->conn); + data->description = NULL; + data->mime_type = g_strdup ("application/x-remote-connection"); + data->app_name = (gchar *) g_get_application_name (); + data->app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL); + data->groups = groups; + data->is_private = FALSE; + + if (!gtk_recent_manager_add_full (manager, uri, data)) + vinagre_utils_show_error (NULL, + _("Error saving recent connection."), + GTK_WINDOW (tab->priv->window)); + + g_free (uri); + g_free (data->app_exec); + g_free (data->mime_type); + g_free (data->display_name); + g_slice_free (GtkRecentData, data); +} + +static void +vinagre_tab_init (VinagreTab *tab) +{ + tab->priv = VINAGRE_TAB_GET_PRIVATE (tab); + tab->priv->save_credentials = FALSE; + tab->priv->keyring_item_id = 0; + tab->priv->state = VINAGRE_TAB_STATE_INITIALIZING; + + /* Create the scrolled window */ + tab->priv->scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tab->priv->scroll), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (tab->priv->scroll), + GTK_SHADOW_NONE); +} + +GtkWidget * +vinagre_tab_new (VinagreConnection *conn, VinagreWindow *window) +{ + VinagrePlugin *plugin; + GtkWidget *tab; + const gchar *protocol = vinagre_connection_get_protocol (conn); + + plugin = g_hash_table_lookup (vinagre_plugin_engine_get_plugins_by_protocol (vinagre_plugins_engine_get_default ()), + protocol); + if (!plugin) + { + g_warning (_("The protocol %s is not supported."), protocol); + return NULL; + } + + return vinagre_plugin_new_tab (plugin, conn, window); +} + +gchar * +vinagre_tab_get_tooltip (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return VINAGRE_TAB_GET_CLASS (tab)->impl_get_tooltip (tab); +} + +gchar * +vinagre_tab_get_extra_title (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return VINAGRE_TAB_GET_CLASS (tab)->impl_get_extra_title (tab); +} + +void +vinagre_tab_get_dimensions (VinagreTab *tab, int *w, int *h) +{ + g_return_if_fail (VINAGRE_IS_TAB (tab)); + + VINAGRE_TAB_GET_CLASS (tab)->impl_get_dimensions (tab, w, h); +} + +VinagreWindow * +vinagre_tab_get_window (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return tab->priv->window; +} + +VinagreConnection * +vinagre_tab_get_conn (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return tab->priv->conn; +} + +void +vinagre_tab_add_view (VinagreTab *tab, GtkWidget *view) +{ + GtkWidget *viewport; + GdkColor color = {0,}; + + g_return_if_fail (VINAGRE_IS_TAB (tab)); + + tab->priv->view = view; + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (tab->priv->scroll), + view); + viewport = gtk_bin_get_child (GTK_BIN (tab->priv->scroll)); + gtk_viewport_set_shadow_type(GTK_VIEWPORT (viewport), GTK_SHADOW_NONE); + gtk_widget_modify_bg (viewport, GTK_STATE_NORMAL, &color); +} + +GtkWidget * +vinagre_tab_get_view (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return tab->priv->view; +} + +void +vinagre_tab_set_title (VinagreTab *tab, + const char *title) +{ + GtkLabel *label; + + g_return_if_fail (VINAGRE_IS_TAB (tab)); + + label = GTK_LABEL (g_object_get_data (G_OBJECT (tab), "label")); + gtk_label_set_label (label, title); +} + +void +vinagre_tab_set_notebook (VinagreTab *tab, + VinagreNotebook *nb) +{ + g_return_if_fail (VINAGRE_IS_TAB (tab)); + g_return_if_fail (VINAGRE_IS_NOTEBOOK (nb)); + + tab->priv->nb = nb; +} + +VinagreNotebook * +vinagre_tab_get_notebook (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return tab->priv->nb; +} + +VinagreTabState +vinagre_tab_get_state (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), VINAGRE_TAB_STATE_INVALID); + + return tab->priv->state; +} + +void +vinagre_tab_set_state (VinagreTab *tab, VinagreTabState state) +{ + tab->priv->state = state; +} + +GtkWidget * +vinagre_tab_get_toolbar (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return tab->priv->toolbar; +} + +VinagreTab * +vinagre_tab_get_from_connection (VinagreConnection *conn) +{ + gpointer res; + + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); + + res = g_object_get_data (G_OBJECT (conn), VINAGRE_TAB_KEY); + + return (res != NULL) ? VINAGRE_TAB (res) : NULL; +} + +gboolean +vinagre_tab_find_credentials_in_keyring (VinagreTab *tab, gchar **username, gchar **password) +{ + GnomeKeyringNetworkPasswordData *found_item; + GnomeKeyringResult result; + GList *matches; + + matches = NULL; + *username = NULL; + *password = NULL; + + result = gnome_keyring_find_network_password_sync ( + vinagre_connection_get_username (tab->priv->conn), /* user */ + NULL, /* domain */ + vinagre_connection_get_host (tab->priv->conn), /* server */ + NULL, /* object */ + vinagre_connection_get_protocol (tab->priv->conn), /* protocol */ + NULL, /* authtype */ + vinagre_connection_get_port (tab->priv->conn), /* port */ + &matches); + + if (result != GNOME_KEYRING_RESULT_OK || matches == NULL || matches->data == NULL) + return FALSE; + + found_item = (GnomeKeyringNetworkPasswordData *) matches->data; + + *username = g_strdup (found_item->user); + *password = g_strdup (found_item->password); + + tab->priv->keyring_item_id = found_item->item_id; + + gnome_keyring_network_password_list_free (matches); + + return TRUE; +} + +void vinagre_tab_set_save_credentials (VinagreTab *tab, gboolean value) +{ + tab->priv->save_credentials = value; +} + +void +vinagre_tab_save_credentials_in_keyring (VinagreTab *tab) +{ + GnomeKeyringResult result; + + if (!tab->priv->save_credentials) + return; + + result = gnome_keyring_set_network_password_sync ( + NULL, /* default keyring */ + vinagre_connection_get_username (tab->priv->conn), /* user */ + NULL, /* domain */ + vinagre_connection_get_host (tab->priv->conn), /* server */ + NULL, /* object */ + vinagre_connection_get_protocol (tab->priv->conn), /* protocol */ + NULL, /* authtype */ + vinagre_connection_get_port (tab->priv->conn), /* port */ + vinagre_connection_get_password (tab->priv->conn), /* password */ + &tab->priv->keyring_item_id); + + if (result != GNOME_KEYRING_RESULT_OK) + vinagre_utils_show_error (_("Error saving the credentials on the keyring."), + gnome_keyring_result_to_message (result), + GTK_WINDOW (tab->priv->window)); + + tab->priv->save_credentials = FALSE; +} + +void vinagre_tab_remove_credentials_from_keyring (VinagreTab *tab) +{ + vinagre_connection_set_username (tab->priv->conn, NULL); + vinagre_connection_set_password (tab->priv->conn, NULL); + + if (tab->priv->keyring_item_id > 0) + { + gnome_keyring_item_delete_sync (NULL, tab->priv->keyring_item_id); + tab->priv->keyring_item_id = 0; + } +} + +void +vinagre_tab_remove_from_notebook (VinagreTab *tab) +{ + vinagre_notebook_close_tab (tab->priv->nb, tab); +} + +static void +add_if_writable (GdkPixbufFormat *data, GSList **list) +{ + if (gdk_pixbuf_format_is_writable (data)) + *list = g_slist_prepend (*list, data); +} + +static GSList * +get_supported_image_formats (void) +{ + GSList *formats = gdk_pixbuf_get_formats (); + GSList *writable_formats = NULL; + + g_slist_foreach (formats, (GFunc)add_if_writable, &writable_formats); + g_slist_free (formats); + + return writable_formats; +} + +static void +filter_changed_cb (GObject *object, GParamSpec *pspec, VinagreTab *tab) +{ + GtkFileFilter *filter; + gchar *extension, *filename, *basename, *newbase; + GtkFileChooser *chooser = GTK_FILE_CHOOSER (object); + int i; + + filter = gtk_file_chooser_get_filter (chooser); + extension = g_object_get_data (G_OBJECT (filter), "extension"); + + filename = gtk_file_chooser_get_filename (chooser); + basename = g_path_get_basename (filename); + for (i = strlen (basename)-1; i>=0; i--) + if (basename[i] == '.') + break; + basename[i] = '\0'; + newbase = g_strdup_printf ("%s.%s", basename, extension); + + gtk_file_chooser_set_current_name (chooser, newbase); + + g_free (filename); + g_free (basename); + g_free (newbase); +} + +void +vinagre_tab_take_screenshot (VinagreTab *tab) +{ + GdkPixbuf *pix; + GtkWidget *dialog; + GString *suggested_filename; + gchar *name; + GtkFileFilter *filter, *initial_filter; + GSList *formats, *l; + + g_return_if_fail (VINAGRE_IS_TAB (tab)); + + pix = VINAGRE_TAB_GET_CLASS (tab)->impl_get_screenshot (tab); + if (!pix) + { + vinagre_utils_show_error (NULL, + _("Could not get a screenshot of the connection."), + GTK_WINDOW (tab->priv->window)); + return; + } + + dialog = gtk_file_chooser_dialog_new (_("Save Screenshot"), + GTK_WINDOW (tab->priv->window), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); + + name = vinagre_connection_get_best_name (tab->priv->conn); + suggested_filename = g_string_new (NULL); + g_string_printf (suggested_filename, _("Screenshot of %s"), name); + g_string_append (suggested_filename, ".png"); + g_free (name); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested_filename->str); + g_string_free (suggested_filename, TRUE); + + formats = get_supported_image_formats (); + for (l = formats; l; l = l->next) + { + GdkPixbufFormat *data = (GdkPixbufFormat *)l->data; + gchar **exts; + int i; + + filter = gtk_file_filter_new (); + + name = gdk_pixbuf_format_get_description (data); + gtk_file_filter_set_name (filter, name); + g_free (name); + + exts = gdk_pixbuf_format_get_extensions (data); + g_object_set_data_full (G_OBJECT (filter), "extension", g_strdup (exts[0]), g_free); + if (strcmp (exts[0], "png") == 0) + initial_filter = filter; + + for (i = 0; exts[i]; i++) + { + name = g_strdup_printf ("*.%s", exts[i]); + gtk_file_filter_add_pattern (filter, name); + g_free (name); + } + g_strfreev (exts); + + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + } + g_slist_free (formats); + + gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), initial_filter); + g_signal_connect (dialog, "notify::filter", G_CALLBACK (filter_changed_cb), tab); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + { + GError *error = NULL; + gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + + filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (dialog)); + name = g_object_get_data (G_OBJECT (filter), "extension"); + if (!name) + name = "png"; + + if (!gdk_pixbuf_save (pix, filename, name, &error, NULL)) + { + vinagre_utils_show_error (_("Error saving screenshot"), + error->message, + GTK_WINDOW (tab->priv->window)); + g_error_free (error); + } + g_free (filename); + } + + gtk_widget_destroy (dialog); + g_object_unref (pix); +} + +const GSList * +vinagre_tab_get_always_sensitive_actions (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return VINAGRE_TAB_GET_CLASS (tab)->impl_get_always_sensitive_actions (tab); +} + +const GSList * +vinagre_tab_get_connected_actions (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return VINAGRE_TAB_GET_CLASS (tab)->impl_get_connected_actions (tab); +} + +const GSList * +vinagre_tab_get_initialized_actions (VinagreTab *tab) +{ + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + return VINAGRE_TAB_GET_CLASS (tab)->impl_get_initialized_actions (tab); +} + +static void +free_actions (gpointer data, gpointer user_data) +{ + VinagreTabUiAction *action = (VinagreTabUiAction *)data; + + g_strfreev (action->paths); + g_object_unref (action->action); + g_free (action); +} + +void +vinagre_tab_free_actions (GSList *actions) +{ + g_slist_foreach (actions, (GFunc) free_actions, NULL); + g_slist_free (actions); +} + +const gchar * +vinagre_tab_get_icon_name (VinagreTab *tab) +{ + const gchar *protocol; + VinagrePlugin *plugin; + + g_return_val_if_fail (VINAGRE_IS_TAB (tab), NULL); + + protocol = vinagre_connection_get_protocol (tab->priv->conn); + plugin = g_hash_table_lookup (vinagre_plugin_engine_get_plugins_by_protocol (vinagre_plugins_engine_get_default ()), + protocol); + g_return_val_if_fail (plugin != NULL, NULL); + + return vinagre_plugin_get_icon_name (plugin); +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-tab.h vinagre-2.29.1/vinagre/vinagre-tab.h --- vinagre-2.26.1/vinagre/vinagre-tab.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-tab.h 2009-08-03 18:01:49.000000000 +0100 @@ -0,0 +1,146 @@ +/* + * vinagre-tab.h + * Abstract base class for all types of tabs: VNC, RDP, etc. + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_TAB_H__ +#define __VINAGRE_TAB_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_TAB (vinagre_tab_get_type()) +#define VINAGRE_TAB(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_TAB, VinagreTab)) +#define VINAGRE_TAB_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_TAB, VinagreTab const)) +#define VINAGRE_TAB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_TAB, VinagreTabClass)) +#define VINAGRE_IS_TAB(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_TAB)) +#define VINAGRE_IS_TAB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_TAB)) +#define VINAGRE_TAB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_TAB, VinagreTabClass)) +#define VINAGRE_TAB_KEY "VINAGRE_TAB_KEY" + +typedef struct _VinagreTabPrivate VinagreTabPrivate; +typedef struct _VinagreTab VinagreTab; +typedef struct _VinagreTabClass VinagreTabClass; + +#include "vinagre-connection.h" +#include "vinagre-notebook.h" +#include "vinagre-window.h" + +typedef enum +{ + VINAGRE_TAB_STATE_INITIALIZING = 1, + VINAGRE_TAB_STATE_CONNECTED, + VINAGRE_TAB_STATE_INVALID +} VinagreTabState; + + +struct _VinagreTab +{ + GtkVBox vbox; + VinagreTabPrivate *priv; +}; + +typedef struct +{ + gchar **paths; /* NULL-terminated array of strings */ + GtkAction *action; +} VinagreTabUiAction; + +struct _VinagreTabClass +{ + GtkVBoxClass parent_class; + + /* Signals */ + void (* tab_connected) (VinagreTab *tab); + void (* tab_disconnected) (VinagreTab *tab); + void (* tab_initialized) (VinagreTab *tab); + void (* tab_auth_failed) (VinagreTab *tab, const gchar *msg); + + /* Virtual functions */ + void (* impl_get_dimensions) (VinagreTab *tab, int *w, int *h); + const GSList *(* impl_get_always_sensitive_actions) (VinagreTab *tab); + const GSList *(* impl_get_connected_actions) (VinagreTab *tab); + const GSList *(* impl_get_initialized_actions) (VinagreTab *tab); + gchar * (* impl_get_extra_title) (VinagreTab *tab); + + /* Abstract functions */ + gchar * (* impl_get_tooltip) (VinagreTab *tab); + GdkPixbuf * (* impl_get_screenshot) (VinagreTab *tab); +}; + +GType vinagre_tab_get_type (void) G_GNUC_CONST; + +GtkWidget * vinagre_tab_new (VinagreConnection *conn, + VinagreWindow *window); + +VinagreConnection * vinagre_tab_get_conn (VinagreTab *tab); +VinagreWindow * vinagre_tab_get_window (VinagreTab *tab); + +void vinagre_tab_add_view (VinagreTab *tab, GtkWidget *view); +GtkWidget * vinagre_tab_get_view (VinagreTab *tab); + +void vinagre_tab_set_title (VinagreTab *tab, + const char *title); + +void vinagre_tab_set_notebook (VinagreTab *tab, + VinagreNotebook *nb); +VinagreNotebook * vinagre_tab_get_notebook (VinagreTab *tab); + +VinagreTabState vinagre_tab_get_state (VinagreTab *tab); +VinagreTab * vinagre_tab_get_from_connection (VinagreConnection *conn); + +void vinagre_tab_take_screenshot (VinagreTab *tab); +gchar * vinagre_tab_get_tooltip (VinagreTab *tab); +void vinagre_tab_get_dimensions (VinagreTab *tab, int *w, int *h); + +const GSList * vinagre_tab_get_always_sensitive_actions(VinagreTab *tab); +const GSList * vinagre_tab_get_connected_actions (VinagreTab *tab); +const GSList * vinagre_tab_get_initialized_actions (VinagreTab *tab); +GtkActionGroup * vinagre_tab_get_action_group (VinagreTab *tab); + +gchar * vinagre_tab_get_extra_title (VinagreTab *tab); +GtkWidget * vinagre_tab_get_toolbar (VinagreTab *tab); + +void vinagre_tab_free_actions (GSList *actions); +const gchar *vinagre_tab_get_icon_name (VinagreTab *tab); + +/* Protected functions */ +void vinagre_tab_set_save_credentials (VinagreTab *tab, gboolean value); +void vinagre_tab_save_credentials_in_keyring (VinagreTab *tab); +gboolean vinagre_tab_find_credentials_in_keyring (VinagreTab *tab, + gchar **username, + gchar **password); +void vinagre_tab_remove_credentials_from_keyring (VinagreTab *tab); + +void vinagre_tab_remove_from_notebook (VinagreTab *tab); +void vinagre_tab_add_recent_used (VinagreTab *tab); +void vinagre_tab_set_state (VinagreTab *tab, + VinagreTabState state); + +void vinagre_tab_add_actions (VinagreTab *tab, + const GtkActionEntry *entries, + guint n_entries); +void vinagre_tab_add_toggle_actions (VinagreTab *tab, + const GtkToggleActionEntry *entries, + guint n_entries); +G_END_DECLS + +#endif /* __VINAGRE_TAB_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-tube-handler.c vinagre-2.29.1/vinagre/vinagre-tube-handler.c --- vinagre-2.26.1/vinagre/vinagre-tube-handler.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-tube-handler.c 2009-08-25 13:01:09.000000000 +0100 @@ -0,0 +1,607 @@ +/* + * vinagre-tube-handler.c + * This file is part of vinagre + * + * © 2009, 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 published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authors: + * Arnaud Maillet + */ + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "vinagre-tube-handler.h" +#include "vinagre-commands.h" +#include "vinagre-tab.h" +#include "vinagre-notebook.h" +#include "vinagre-debug.h" +#include "vinagre-plugin.h" +#include "vinagre-plugins-engine.h" + +G_DEFINE_TYPE (VinagreTubeHandler, vinagre_tube_handler, G_TYPE_OBJECT); + +#define VINAGRE_TUBE_HANDLER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), VINAGRE_TYPE_TUBE_HANDLER, VinagreTubeHandlerPrivate)) + +typedef struct _VinagreTubeHandlerPrivate VinagreTubeHandlerPrivate; + +struct _VinagreTubeHandlerPrivate +{ + VinagreWindow *window; + TpChannel *channel; + VinagreTab *tab; + VinagreNotebook *nb; + gulong signal_disconnect_id; + gulong signal_invalidated_id; + gchar *hostname; + guint port; +}; + +enum +{ + DISCONNECTED, + LAST_SIGNAL +}; + +enum +{ + PROP_0, + PROP_VINAGRE_WINDOW, + PROP_CHANNEL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +static void +vinagre_tube_handler_dispose (GObject *object) +{ + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE(object); + + vinagre_debug_message (DEBUG_TUBE, + "-- Destruction of a Tube handler --\n"); + + if (priv->channel != NULL) + { + tp_cli_channel_call_close (priv->channel, -1, + NULL, NULL, NULL, NULL); + g_object_unref (priv->channel); + priv->channel = NULL; + } + + G_OBJECT_CLASS (vinagre_tube_handler_parent_class)->dispose (object); +} + +static void +vinagre_tube_handler_set_vinagre_window (VinagreTubeHandler *self, + gpointer *vinagre_window) +{ + g_return_if_fail (VINAGRE_IS_TUBE_HANDLER (self)); + + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); + priv->window = VINAGRE_WINDOW (vinagre_window); +} + +static void +vinagre_tube_handler_set_channel (VinagreTubeHandler *self, + gpointer *channel) +{ + g_return_if_fail (VINAGRE_IS_TUBE_HANDLER (self)); + + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); + priv->channel = g_object_ref (channel); +} + +static void +vinagre_tube_handler_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + VinagreTubeHandler *self = VINAGRE_TUBE_HANDLER (object); + + switch (prop_id) + { + case PROP_VINAGRE_WINDOW: + vinagre_tube_handler_set_vinagre_window (self, + g_value_get_object (value)); + break; + case PROP_CHANNEL: + vinagre_tube_handler_set_channel (self, + g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_tube_handler_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (object); + + switch (prop_id) + { + case PROP_VINAGRE_WINDOW: + g_value_set_object (value, priv->window); + break; + case PROP_CHANNEL: + g_value_set_object (value, priv->channel); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_tube_handler_fire_disconnected (VinagreTubeHandler *self) +{ + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); + + g_signal_handler_disconnect (G_OBJECT (priv->nb), + priv->signal_disconnect_id); + + if (priv->channel != NULL) + g_signal_handler_disconnect (G_OBJECT (priv->channel), + priv->signal_invalidated_id); + + g_signal_emit (G_OBJECT (self), signals[DISCONNECTED], 0); +} + +static void +vinagre_tube_handler_tab_disconnected_cb (GtkNotebook *notebook, + GtkWidget *child, + guint page_num, + gpointer self) +{ + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); + VinagreTab *tab = VINAGRE_TAB (child); + + if (priv->tab == tab) + { + vinagre_debug_message (DEBUG_TUBE, + "Tab has been destroyed. Closing the tube handler.\n"); + vinagre_tube_handler_fire_disconnected (self); + } +} + +static void +vinagre_tube_handler_tube_invalidated (TpProxy *channel, + guint domain, + gint code, + gchar *message, + gpointer self) +{ + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); + + vinagre_debug_message (DEBUG_TUBE, "Tube is invalidated : %s\n", message); + + g_object_unref (priv->channel); + priv->channel = NULL; + + vinagre_tube_handler_fire_disconnected (self); +} + +static void +vinagre_tube_handler_call_service_cb (TpProxy *channel, + const GValue *service, + const GError *error, + gpointer self, + GObject *weak_object) +{ + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); + gchar *error_msg = NULL; + gchar *error_conn_msg = NULL; + VinagreConnection *conn = NULL; + gchar *port_s; + gchar *host; + const gchar *service_s; + VinagrePlugin *plugin; + + if (error != NULL) + { + error_msg = g_strdup_printf + (_("Impossible to get service property: %s"), + error->message); + vinagre_utils_show_error (NULL, (const gchar *) error_msg, + GTK_WINDOW (priv->window)); + g_free (priv->hostname); + g_free (error_msg); + g_signal_emit (G_OBJECT (self), signals[DISCONNECTED], 0); + return; + } + + service_s = g_value_get_string (service); + + vinagre_debug_message (DEBUG_TUBE, "service name = %s\n", + service_s); + + if (!g_strcmp0 (service_s, "rfb")) + service_s = "vnc"; + + plugin = vinagre_plugins_engine_get_plugin_by_protocol + (vinagre_plugins_engine_get_default (), service_s); + + if (plugin == NULL) + { + error_msg = g_strdup_printf + (_("The protocol %s is not supported."), service_s); + vinagre_utils_show_error (NULL, (const gchar *) error_msg, + GTK_WINDOW (priv->window)); + g_free (priv->hostname); + g_free (error_msg); + g_signal_emit (G_OBJECT (self), signals[DISCONNECTED], 0); + return; + } + + priv->signal_invalidated_id = g_signal_connect (G_OBJECT (priv->channel), + "invalidated", G_CALLBACK (vinagre_tube_handler_tube_invalidated), + self); + + port_s = g_strdup_printf ("%u", priv->port); + + host = g_strconcat (vinagre_plugin_get_protocol (plugin), "://", + priv->hostname, ":", port_s, + NULL); + + vinagre_debug_message (DEBUG_TUBE, "Host = %s\n", + host); + + g_free (port_s); + g_free (priv->hostname); + + conn = vinagre_connection_new_from_string (host, &error_conn_msg, + TRUE); + + g_free (host); + + if (conn == NULL) + { + error_msg = g_strdup_printf + (_("Impossible to create the connection: %s"), error_conn_msg); + vinagre_utils_show_error (NULL, (const gchar *) error_msg, + GTK_WINDOW (priv->window)); + g_signal_handler_disconnect (G_OBJECT (priv->channel), + priv->signal_invalidated_id); + g_free (error_conn_msg); + g_free (error_msg); + g_signal_emit (G_OBJECT (self), signals[DISCONNECTED], 0); + return; + } + + vinagre_cmd_direct_connect (conn, priv->window); + + priv->tab = vinagre_window_conn_exists (priv->window, conn); + + priv->nb = vinagre_tab_get_notebook (priv->tab); + + g_assert (priv->tab != NULL); + + g_assert (priv->nb != NULL); + + priv->signal_disconnect_id = g_signal_connect (G_OBJECT (priv->nb), + "page-removed", G_CALLBACK + (vinagre_tube_handler_tab_disconnected_cb), self); +} + +static void +vinagre_tube_handler_accept_stream_tube_cb (TpChannel *channel, + const GValue *address, + const GError *error, + gpointer self, + GObject *weak_object) +{ + gchar *error_msg = NULL; + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); + + if (error != NULL) + { + error_msg = g_strdup_printf + (_("Impossible to accept the stream tube: %s"), + error->message); + vinagre_utils_show_error (NULL, (const gchar *) error_msg, + GTK_WINDOW (priv->window)); + g_free (error_msg); + g_signal_emit (G_OBJECT (self), signals[DISCONNECTED], 0); + return ; + } + + dbus_g_type_struct_get (address, 0, &priv->hostname, 1, &priv->port, + G_MAXUINT); + + tp_cli_dbus_properties_call_get (channel, + -1, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE, "Service", + vinagre_tube_handler_call_service_cb, + self, NULL, NULL); +} + +static void +vinagre_tube_handler_dialog_response_cb (GtkDialog *dialog, + gint response, + gpointer self) +{ + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); + GValue access_control_param = {0,}; + + if (response == GTK_RESPONSE_OK) + { + g_value_init (&access_control_param, G_TYPE_STRING); + /* With the Localhost access control method, the access + control param is unused; set a dummy value */ + g_value_set_static_string (&access_control_param, ""); + tp_cli_channel_type_stream_tube_call_accept (priv->channel, -1, + TP_SOCKET_ADDRESS_TYPE_IPV4, TP_SOCKET_ACCESS_CONTROL_LOCALHOST, + &access_control_param, vinagre_tube_handler_accept_stream_tube_cb, + self, NULL, NULL); + g_value_unset (&access_control_param); + } + else + { + g_signal_emit (G_OBJECT (self), signals[DISCONNECTED], 0); + } + + gtk_widget_destroy (GTK_WIDGET (dialog)); +} + +static gchar * +vinagre_tube_handler_contact_get_avatar_filename (TpContact *contact, + const gchar *token, + VinagreTubeHandler *self) +{ + gchar *avatar_path; + gchar *avatar_file; + gchar *token_escaped; + TpConnection *connection; + gchar *cm; + gchar *protocol; + + if (contact == NULL) + return NULL; + + token_escaped = tp_escape_as_identifier (token); + + connection = tp_contact_get_connection (contact); + + if (!tp_connection_parse_object_path (connection, &protocol, &cm)) + { + vinagre_debug_message (DEBUG_TUBE, "Impossible to parse object path\n"); + return NULL; + } + + avatar_path = g_build_filename (g_get_user_cache_dir (), + "telepathy", + "avatars", + cm, + protocol, + NULL); + g_mkdir_with_parents (avatar_path, 0700); + + avatar_file = g_build_filename (avatar_path, token_escaped, NULL); + + g_free (token_escaped); + g_free (avatar_path); + g_free (cm); + g_free (protocol); + + return avatar_file; +} + +static GdkPixbuf* +vinagre_tube_handler_pixbuf_scale_down_if_necessary (GdkPixbuf *pixbuf, + gint max_size) +{ + gint width, height; + gdouble factor; + + width = gdk_pixbuf_get_width (pixbuf); + height = gdk_pixbuf_get_height (pixbuf); + + if (width > 0 && (width > max_size || height > max_size)) + { + factor = (gdouble) max_size / MAX (width, height); + + width = width * factor; + height = height * factor; + + return gdk_pixbuf_scale_simple (pixbuf, + width, height, + GDK_INTERP_HYPER); + } + + return g_object_ref (pixbuf); +} + +static void +vinagre_tube_handler_factory_handle_cb (TpConnection *connection, + guint n_contacts, + TpContact * const *contacts, + guint n_failed, + const TpHandle *failed, + const GError *error, + gpointer self, + GObject *weak_object) +{ + GtkWidget *dialog; + GdkPixbuf *pixbuf_view; + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); + TpContact *contact; + const gchar *alias; + const gchar *token; + gchar *filename; + GtkWidget *image; + GError *error_failed = NULL; + gchar *error_msg = NULL; + + if (error != NULL) + { + error_msg = g_strdup_printf + (_("Impossible to get the contact name: %s"), error->message); + vinagre_utils_show_error (NULL, (const gchar *) error_msg, + GTK_WINDOW (priv->window)); + g_free (error_msg); + g_signal_emit (G_OBJECT (self), signals[DISCONNECTED], 0); + return; + } + + contact = contacts[0]; + + alias = tp_contact_get_alias (contact); + token = tp_contact_get_avatar_token (contact); + + if (!tp_strdiff (token, "")) + { + image = gtk_image_new_from_icon_name ("stock_person", + GTK_ICON_SIZE_DIALOG); + } + else + { + filename = vinagre_tube_handler_contact_get_avatar_filename (contact, + token, self); + + if (filename == NULL) + { + image = gtk_image_new_from_icon_name ("stock_person", + GTK_ICON_SIZE_DIALOG); + } + else + { + pixbuf_view = gdk_pixbuf_new_from_file (filename, &error_failed); + + if (pixbuf_view == NULL) + { + error_msg = g_strdup_printf + (_("Impossible to get the avatar: %s"), + error_failed->message); + vinagre_utils_show_error (NULL, (const gchar *) error_msg, + GTK_WINDOW (priv->window)); + g_free (error_msg); + image = gtk_image_new_from_icon_name ("stock_person", + GTK_ICON_SIZE_DIALOG); + } + else + { + pixbuf_view = vinagre_tube_handler_pixbuf_scale_down_if_necessary + (pixbuf_view, 64); + image = gtk_image_new_from_pixbuf (pixbuf_view); + g_object_unref (pixbuf_view); + } + g_free (filename); + } + } + + dialog = gtk_message_dialog_new (GTK_WINDOW (priv->window), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, + GTK_BUTTONS_OK_CANCEL, _("%s wants to share his desktop with you."), + alias); + + gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image); + + gtk_window_set_title (GTK_WINDOW (dialog), _("Desktop sharing invitation")); + + g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK + (vinagre_tube_handler_dialog_response_cb), self); + + gtk_widget_show_all (GTK_WIDGET (dialog)); +} + +static void +vinagre_tube_handler_constructed (GObject *object) +{ + VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (object); + TpConnection *connection; + TpHandle handle; + TpContactFeature features[] = { TP_CONTACT_FEATURE_ALIAS, + TP_CONTACT_FEATURE_AVATAR_TOKEN }; + + vinagre_debug_message (DEBUG_TUBE, "-- New Tube handler --\n"); + + connection = tp_channel_borrow_connection (priv->channel); + + handle = tp_channel_get_handle (priv->channel, NULL); + + tp_connection_get_contacts_by_handle (connection, 1, &handle, + G_N_ELEMENTS(features), features, + vinagre_tube_handler_factory_handle_cb, object, NULL, NULL); +} + +static void +vinagre_tube_handler_class_init (VinagreTubeHandlerClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->constructed = vinagre_tube_handler_constructed; + gobject_class->set_property = vinagre_tube_handler_set_property; + gobject_class->get_property = vinagre_tube_handler_get_property; + gobject_class->dispose = vinagre_tube_handler_dispose; + + signals[DISCONNECTED] = + g_signal_new ("disconnected", + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (VinagreTubeHandlerClass, disconnected), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); + + g_object_class_install_property (gobject_class, + PROP_VINAGRE_WINDOW, + g_param_spec_object ("vinagre-window", + "Vinagre window", + "The Vinagre window", + VINAGRE_TYPE_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (gobject_class, + PROP_CHANNEL, + g_param_spec_object ("channel", + "Vinagre tp channel", + "The Vinagre tp channel", + TP_TYPE_CHANNEL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + + g_type_class_add_private (klass, sizeof (VinagreTubeHandlerPrivate)); +} + +static void +vinagre_tube_handler_init (VinagreTubeHandler *object) +{ +} + +VinagreTubeHandler * +vinagre_tube_handler_new (VinagreWindow *vinagre_window, TpChannel *channel) +{ + return g_object_new (VINAGRE_TYPE_TUBE_HANDLER, + "vinagre-window", vinagre_window, + "channel", channel, + NULL); +} diff -Nru vinagre-2.26.1/vinagre/vinagre-tube-handler.h vinagre-2.29.1/vinagre/vinagre-tube-handler.h --- vinagre-2.26.1/vinagre/vinagre-tube-handler.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-tube-handler.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,69 @@ +/* + * vinagre-tube-handler.h + * This file is part of vinagre + * + * © 2009, 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 published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authors: + * Arnaud Maillet + */ + +#ifndef __VINAGRE_TUBE_HANDLER_H__ +#define __VINAGRE_TUBE_HANDLER_H__ + +#include + +#include + +#include "vinagre-window.h" + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_TUBE_HANDLER (vinagre_tube_handler_get_type()) +#define VINAGRE_TUBE_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),\ + VINAGRE_TYPE_TUBE_HANDLER, VinagreTubeHandler)) +#define VINAGRE_IS_TUBE_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),\ + VINAGRE_TYPE_TUBE_HANDLER)) +#define VINAGRE_TUBE_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),\ + VINAGRE_TYPE_TUBE_HANDLER, VinagreTubeHandlerClass)) +#define VINAGRE_IS_TUBE_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \ + ((klass), VINAGRE_TYPE_TUBE_HANDLER)) +#define VINAGRE_TUBE_HANDLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), VINAGRE_TYPE_TUBE_HANDLER, VinagreTubeHandlerClass)) + +typedef struct _VinagreTubeHandler VinagreTubeHandler; +typedef struct _VinagreTubeHandlerClass VinagreTubeHandlerClass; + + +struct _VinagreTubeHandler +{ + GObject parent_instance; +}; + +struct _VinagreTubeHandlerClass +{ + GObjectClass parent_class; + + void (* disconnected) (VinagreTubeHandler *htube); +}; + +GType vinagre_tube_handler_get_type (void) G_GNUC_CONST; +VinagreTubeHandler* vinagre_tube_handler_new (VinagreWindow *vinagre_window, + TpChannel *channel); + +G_END_DECLS + +#endif \ No newline at end of file diff -Nru vinagre-2.26.1/vinagre/vinagre-tubes-manager.c vinagre-2.29.1/vinagre/vinagre-tubes-manager.c --- vinagre-2.26.1/vinagre/vinagre-tubes-manager.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-tubes-manager.c 2009-08-10 13:25:15.000000000 +0100 @@ -0,0 +1,335 @@ +/* + * vinagre-tubes-manager.c + * This file is part of vinagre + * + * © 2009, 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 published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authors: + * Arnaud Maillet + */ + +#include + +#include +#include + +#include +#include +#include + +#include "vinagre-tubes-manager.h" +#include "vinagre-tube-handler.h" +#include "vinagre-debug.h" + +#define BUS_NAME "org.gnome.Empathy.StreamTubeHandler.rfb" +#define OBJECT_PATH "/org/gnome/Empathy/StreamTubeHandler/rfb" + +static gboolean +vinagre_tubes_manager_handle_tube (VinagreTubesManager *object, + const gchar *bus_name, + const gchar *connection, + const gchar *channel, + guint handle_type, + guint handle, + GError **error); + +#include "dbus-interface-glue.h" + +G_DEFINE_TYPE (VinagreTubesManager, vinagre_tubes_manager, G_TYPE_OBJECT); + +#define VINAGRE_TUBES_MANAGER_GET_PRIVATE(obj)\ + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), VINAGRE_TYPE_TUBES_MANAGER,\ + VinagreTubesManagerPrivate)) + +typedef struct _VinagreTubesManagerPrivate VinagreTubesManagerPrivate; + +struct _VinagreTubesManagerPrivate +{ + VinagreWindow *window; + GSList *tubes_handler; +}; + +enum +{ + PROP_0, + PROP_VINAGRE_WINDOW +}; + +typedef struct +{ + VinagreTubesManager *tmanager; + gchar *bus_name; + gchar *connection; + gchar *channel; + guint handle_type; + guint handle; +} IdleData; + +static void +vinagre_tubes_manager_dispose (GObject *object) +{ + VinagreTubesManagerPrivate *priv = VINAGRE_TUBES_MANAGER_GET_PRIVATE + (object); + GSList *l; + + for (l = priv->tubes_handler; l; l = l->next) + g_object_unref (l->data); + + g_slist_free (priv->tubes_handler); + priv->tubes_handler = NULL; + + G_OBJECT_CLASS (vinagre_tubes_manager_parent_class)->dispose (object); +} + +static void +vinagre_tubes_manager_set_vinagre_window (VinagreTubesManager *self, + gpointer *vinagre_window) +{ + g_return_if_fail (VINAGRE_IS_TUBES_MANAGER (self)); + + VinagreTubesManagerPrivate *priv = VINAGRE_TUBES_MANAGER_GET_PRIVATE (self); + priv->window = VINAGRE_WINDOW (vinagre_window); +} + +static void +vinagre_tubes_manager_set_property (GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) +{ + VinagreTubesManager *self = VINAGRE_TUBES_MANAGER (object); + + switch (prop_id) + { + case PROP_VINAGRE_WINDOW: + vinagre_tubes_manager_set_vinagre_window (self, + g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_tubes_manager_get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec) +{ + VinagreTubesManagerPrivate *priv = VINAGRE_TUBES_MANAGER_GET_PRIVATE + (object); + + switch (prop_id) + { + case PROP_VINAGRE_WINDOW: + g_value_set_object (value, priv->window); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +vinagre_tubes_manager_disconnected_cb (VinagreTubeHandler *htube, + gpointer self) +{ + VinagreTubesManagerPrivate *priv = VINAGRE_TUBES_MANAGER_GET_PRIVATE (self); + priv->tubes_handler = g_slist_remove (priv->tubes_handler, htube); + g_object_unref (htube); +} + +static void +vinagre_tubes_manager_tube_ready_destroy_notify (gpointer data) +{ + IdleData *idle_data = data; + + g_free (idle_data->bus_name); + g_free (idle_data->connection); + g_free (idle_data->channel); + g_slice_free (IdleData, idle_data); +} + +static void +vinagre_tubes_manager_channel_ready_cb (TpChannel *channel, + const GError *error, + gpointer data) +{ + IdleData *idle_data = data; + VinagreTubeHandler *htube; + VinagreTubesManagerPrivate *priv = VINAGRE_TUBES_MANAGER_GET_PRIVATE + (idle_data->tmanager); + + if (error != NULL) + { + vinagre_debug_message (DEBUG_TUBE,"channel has been invalidated: %s", error->message); + vinagre_tubes_manager_tube_ready_destroy_notify (data); + g_object_unref (channel); + return; + } + + htube = vinagre_tube_handler_new (priv->window, channel); + + priv->tubes_handler = g_slist_prepend (priv->tubes_handler, htube); + + g_signal_connect (G_OBJECT (htube), "disconnected", G_CALLBACK + (vinagre_tubes_manager_disconnected_cb), idle_data->tmanager); + + vinagre_tubes_manager_tube_ready_destroy_notify (data); +} + +static void +vinagre_tubes_manager_connection_ready_cb (TpConnection *connection, + const GError *error, + gpointer data) +{ + TpChannel *channel; + IdleData *idle_data = data; + + if (error != NULL) + { + vinagre_debug_message (DEBUG_TUBE,"connection has been invalidated: %s", error->message); + vinagre_tubes_manager_tube_ready_destroy_notify (data); + g_object_unref (connection); + return; + } + + channel = tp_channel_new (connection, idle_data->channel, + TP_IFACE_CHANNEL_TYPE_TUBES, idle_data->handle_type, + idle_data->handle, NULL); + tp_channel_call_when_ready (channel, + vinagre_tubes_manager_channel_ready_cb, idle_data); +} + +static gboolean +vinagre_tubes_manager_handle_tube_idle_cb (gpointer data) +{ + IdleData *idle_data = data; + TpConnection *connection; + static TpDBusDaemon *daemon = NULL; + + vinagre_debug_message (DEBUG_TUBE,"New tube to be handled"); + + if (!daemon) + daemon = tp_dbus_daemon_new (tp_get_bus ()); + + connection = tp_connection_new (daemon, idle_data->bus_name, + idle_data->connection, NULL); + tp_connection_call_when_ready (connection, + vinagre_tubes_manager_connection_ready_cb, idle_data); + + g_object_unref (connection); + return FALSE; +} + +static gboolean +vinagre_tubes_manager_handle_tube (VinagreTubesManager *object, + const gchar *bus_name, + const gchar *connection, + const gchar *channel, + guint handle_type, + guint handle, + GError **error) +{ + VinagreTubesManager * self = VINAGRE_TUBES_MANAGER (object); + IdleData *data; + + data = g_slice_new (IdleData); + data->tmanager = self; + data->bus_name = g_strdup (bus_name); + data->connection = g_strdup (connection); + data->channel = g_strdup (channel); + data->handle_type = handle_type; + data->handle = handle; + + g_idle_add_full (G_PRIORITY_HIGH, vinagre_tubes_manager_handle_tube_idle_cb, + data, NULL); + return TRUE; +} + +static void +vinagre_tubes_manager_register_tube_handler (GObject *object) +{ + DBusGProxy *proxy; + guint result; + GError *error = NULL; + + dbus_g_object_type_install_info (VINAGRE_TYPE_TUBES_MANAGER, + &dbus_glib_vinagre_tubes_manager_object_info); + + proxy = dbus_g_proxy_new_for_name (tp_get_bus (), DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); + + if (!dbus_g_proxy_call (proxy, "RequestName", &error, + G_TYPE_STRING, BUS_NAME, G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE, + G_TYPE_INVALID, G_TYPE_UINT, &result, G_TYPE_INVALID)) + { + vinagre_debug_message (DEBUG_TUBE,"Failed to request name: %s", + error ? error->message : "No error given"); + g_clear_error (&error); + goto OUT; + } + + vinagre_debug_message (DEBUG_TUBE,"Creating tube handler %s object_path:%s\n", BUS_NAME, + OBJECT_PATH); + dbus_g_connection_register_g_object (tp_get_bus (), OBJECT_PATH, + G_OBJECT (object)); + +OUT: + g_object_unref (proxy); +} + +static void +vinagre_tubes_manager_constructed (GObject *object) +{ + VinagreTubesManagerPrivate *priv = VINAGRE_TUBES_MANAGER_GET_PRIVATE + (object); + + vinagre_tubes_manager_register_tube_handler (object); +} + +static void +vinagre_tubes_manager_class_init (VinagreTubesManagerClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->constructed = vinagre_tubes_manager_constructed; + gobject_class->set_property = vinagre_tubes_manager_set_property; + gobject_class->get_property = vinagre_tubes_manager_get_property; + gobject_class->dispose = vinagre_tubes_manager_dispose; + + g_object_class_install_property (gobject_class, + PROP_VINAGRE_WINDOW, + g_param_spec_object ("vinagre-window", + "Vinagre window", + "The Vinagre window", + VINAGRE_TYPE_WINDOW, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_STRINGS)); + + g_type_class_add_private (klass, sizeof (VinagreTubesManagerPrivate)); +} + +static void +vinagre_tubes_manager_init (VinagreTubesManager *object) +{ +} + +VinagreTubesManager * +vinagre_tubes_manager_new (VinagreWindow *vinagre_window) +{ + return g_object_new (VINAGRE_TYPE_TUBES_MANAGER, + "vinagre-window", vinagre_window, + NULL); +} diff -Nru vinagre-2.26.1/vinagre/vinagre-tubes-manager.h vinagre-2.29.1/vinagre/vinagre-tubes-manager.h --- vinagre-2.26.1/vinagre/vinagre-tubes-manager.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-tubes-manager.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,65 @@ +/* + * vinagre-tubes-manager.h + * This file is part of vinagre + * + * © 2009, 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 published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authors: + * Arnaud Maillet + */ + +#ifndef __VINAGRE_TUBES_MANAGER_H__ +#define __VINAGRE_TUBES_MANAGER_H__ + +#include + +#include "vinagre-window.h" + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_TUBES_MANAGER (vinagre_tubes_manager_get_type()) +#define VINAGRE_TUBES_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),\ + VINAGRE_TYPE_TUBES_MANAGER, VinagreTubesManager)) +#define VINAGRE_IS_TUBES_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),\ + VINAGRE_TYPE_TUBES_MANAGER)) +#define VINAGRE_TUBES_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),\ + VINAGRE_TYPE_TUBES_MANAGER, VinagreTubesManagerClass)) +#define VINAGRE_IS_TUBES_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \ + ((klass), VINAGRE_TYPE_TUBES_MANAGER)) +#define VINAGRE_TUBES_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), VINAGRE_TYPE_TUBES_MANAGER, VinagreTubesManagerClass)) + +typedef struct _VinagreTubesManager VinagreTubesManager; +typedef struct _VinagreTubesManagerClass VinagreTubesManagerClass; + + +struct _VinagreTubesManager +{ + GObject parent_instance; +}; + +struct _VinagreTubesManagerClass +{ + GObjectClass parent_class; +}; + +GType vinagre_tubes_manager_get_type (void) G_GNUC_CONST; +VinagreTubesManager* vinagre_tubes_manager_new (VinagreWindow + *vinagre_window); + +G_END_DECLS + +#endif \ No newline at end of file diff -Nru vinagre-2.26.1/vinagre/vinagre-ui.h vinagre-2.29.1/vinagre/vinagre-ui.h --- vinagre-2.26.1/vinagre/vinagre-ui.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-ui.h 2009-10-24 21:54:50.000000000 +0100 @@ -0,0 +1,108 @@ +/* + * vinagre-ui.h + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_UI_H__ +#define __VINAGRE_UI_H__ + +#include + +#include "vinagre-commands.h" + +G_BEGIN_DECLS + +static const GtkActionEntry vinagre_always_sensitive_entries[] = +{ + /* Toplevel */ + { "Machine", NULL, N_("_Machine") }, + { "Edit", NULL, N_("_Edit") }, + { "View", NULL, N_("_View") }, + { "Bookmarks", NULL, N_("_Bookmarks") }, + { "Help", NULL, N_("_Help") }, + + /* Machine menu */ + { "MachineConnect", GTK_STOCK_CONNECT, NULL, "N", + N_("Connect to a remote machine"), G_CALLBACK (vinagre_cmd_machine_connect) }, + { "MachineOpen", GTK_STOCK_OPEN, NULL, "O", + N_("Open a .VNC file"), G_CALLBACK (vinagre_cmd_machine_open) }, + { "MachineQuit", GTK_STOCK_QUIT, NULL, "Q", + N_("Quit the program"), G_CALLBACK (vinagre_cmd_machine_quit) }, + + /* Edit menu */ + { "EditPreferences", GTK_STOCK_PREFERENCES, NULL, NULL, + N_("Edit the application preferences"), G_CALLBACK (vinagre_cmd_edit_preferences) }, + { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL, + N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) }, + + /* Help menu */ + {"HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", + N_("Open the vinagre manual"), G_CALLBACK (vinagre_cmd_help_contents)}, + { "HelpAbout", GTK_STOCK_ABOUT, NULL, NULL, + N_("About this application"), G_CALLBACK (vinagre_cmd_help_about) } +}; + +static const GtkToggleActionEntry vinagre_always_sensitive_toggle_entries[] = +{ + { "ViewToolbar", NULL, N_("_Toolbar"), NULL, + N_("Show or hide the toolbar"), + G_CALLBACK (vinagre_cmd_view_show_toolbar), FALSE }, + + { "ViewStatusbar", NULL, N_("_Statusbar"), NULL, + N_("Show or hide the statusbar"), + G_CALLBACK (vinagre_cmd_view_show_statusbar), FALSE }, + + { "ViewSidePanel", NULL, N_("Side _Panel"), "F9", + N_("Show or hide the side panel"), + G_CALLBACK (vinagre_cmd_view_show_fav_panel), FALSE } +}; + +static const GtkActionEntry vinagre_machine_connected_entries[] = +{ + /* Machine menu */ + { "MachineClose", GTK_STOCK_CLOSE, NULL, "W", + N_("Close the current connection"), G_CALLBACK (vinagre_cmd_machine_close) }, + { "MachineCloseAll", GTK_STOCK_CLOSE, N_("C_lose All"), "W", + N_("Close all active connections"), G_CALLBACK (vinagre_cmd_machine_close_all) }, + + /* Bookmarks menu */ + { "BookmarksAdd", GTK_STOCK_SAVE, N_("_Add to bookmarks"), "D", + N_("Add current connection to your bookmarks"), G_CALLBACK (vinagre_cmd_bookmarks_add) } + +}; + +static const GtkActionEntry vinagre_machine_initialized_entries[] = +{ + /* Machine menu */ + { "MachineTakeScreenshot", "applets-screenshooter", N_("Take screenshot"), NULL, + N_("Take a screenshot of active connection"), G_CALLBACK (vinagre_cmd_machine_take_screenshot) }, + + /* View menu */ + { "ViewFullScreen", GTK_STOCK_FULLSCREEN, NULL, "F11", + N_("View the current machine in full screen"), G_CALLBACK (vinagre_cmd_view_fullscreen) } +}; + +static const GtkToggleActionEntry vinagre_machine_initialized_toggle_entries[] = +{ + 0, +}; + +G_END_DECLS + +#endif /* __VINAGRE_UI_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-utils.c vinagre-2.29.1/vinagre/vinagre-utils.c --- vinagre-2.26.1/vinagre/vinagre-utils.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-utils.c 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,550 @@ +/* + * vinagre-utils.c + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include "vinagre-utils.h" + +#define VINAGRE_UI_FILE "vinagre.ui" +#define VINAGRE_UI_XML_FILE "vinagre-ui.xml" + +#ifdef HAVE_CONFIG_H +#include +#endif + +/* For the workspace/viewport stuff */ +#ifdef GDK_WINDOWING_X11 +#include +#include +#include +#include +#endif + +GtkWidget * +vinagre_utils_create_small_close_button () +{ + GtkRcStyle *rcstyle; + GtkWidget *image; + GtkWidget *close_button; + + close_button = gtk_button_new (); + gtk_button_set_relief (GTK_BUTTON (close_button), + GTK_RELIEF_NONE); + /* don't allow focus on the close button */ + gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); + + /* make it as small as possible */ + rcstyle = gtk_rc_style_new (); + rcstyle->xthickness = rcstyle->ythickness = 0; + gtk_widget_modify_style (close_button, rcstyle); + g_object_unref (rcstyle), + + image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, + GTK_ICON_SIZE_MENU); + gtk_container_add (GTK_CONTAINER (close_button), image); + + return close_button; +} + +void +vinagre_utils_show_error (const gchar *title, const gchar *message, GtkWindow *parent) +{ + GtkWidget *d; + gchar *t; + + if (title) + t = g_strdup (title); + else + t = g_strdup (_("An error has occurred:")); + + d = gtk_message_dialog_new (parent, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s", + t); + g_free (t); + + if (message) + gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (d), + "%s", + message); + + g_signal_connect_swapped (d, + "response", + G_CALLBACK (gtk_widget_destroy), + d); + gtk_widget_show_all (GTK_WIDGET(d)); +} + +void +vinagre_utils_show_many_errors (const gchar *title, GSList *items, GtkWindow *parent) +{ + GString *msg; + GSList *l; + + msg = g_string_new (NULL); + + for (l = items; l; l = l->next) + g_string_append_printf (msg, "%s\n", (gchar *)l->data); + + vinagre_utils_show_error (title, msg->str, parent); + g_string_free (msg, TRUE); +} + +void +vinagre_utils_toggle_widget_visible (GtkWidget *widget) +{ + if (GTK_WIDGET_VISIBLE (widget)) + gtk_widget_hide (widget); + else + gtk_widget_show_all (widget); +} + +const gchar * +vinagre_utils_get_ui_filename (void) +{ + if (g_file_test (VINAGRE_UI_FILE, G_FILE_TEST_EXISTS)) + return VINAGRE_UI_FILE; + else + return VINAGRE_DATADIR "/" VINAGRE_UI_FILE; +} + +const gchar * +vinagre_utils_get_ui_xml_filename (void) +{ + if (g_file_test (VINAGRE_UI_XML_FILE, G_FILE_TEST_EXISTS)) + return VINAGRE_UI_XML_FILE; + else + return VINAGRE_DATADIR "/" VINAGRE_UI_XML_FILE; +} + +/** + * vinagre_utils_get_builder: + * @plugin: a #VinagrePlugin or NULL + * @filename: the filename of the UI file for the plugin, or NULL if plugin is NULL + * + * This function gets a #GtkBuilder object for a UI file. + * Supply a plugin and a filename in order to get a #GtkBuilder for the plugin. + * Supply NULL to both arguments to get the main Vinagre #GtkBuilder + * + * Returns a #GtkBuilder on success (free with #g_object_unref) or NULL + * if the file cannot be found. In this case an error dialog will be shown. + */ +GtkBuilder * +vinagre_utils_get_builder (VinagrePlugin *plugin, const gchar *filename) +{ + GtkBuilder *xml = NULL; + GError *error = NULL; + gchar *actual_filename, *plugin_datadir; + + if (plugin) + { + plugin_datadir = vinagre_plugin_get_data_dir (plugin); + actual_filename = g_build_filename (plugin_datadir, filename, NULL); + g_free (plugin_datadir); + } + else + actual_filename = g_strdup (vinagre_utils_get_ui_filename ()); + + xml = gtk_builder_new (); + if (!gtk_builder_add_from_file (xml, + actual_filename, + &error)) + { + GString *str = g_string_new (NULL); + + if (plugin) + g_string_append (str, _("A plugin tried to open an UI file but did not succeed, with the error message:")); + else + g_string_append (str, _("The program tried to open an UI file but did not succeed, with the error message:")); + + g_string_append_printf (str, "\n\n%s\n\n", error->message); + g_string_append (str, _("Please check your installation.")); + vinagre_utils_show_error (_("Error loading UI file"), str->str, NULL); + g_error_free (error); + g_string_free (str, TRUE); + g_object_unref (xml); + xml = NULL; + } + + g_free (actual_filename); + return xml; +} + +/* + * Doubles underscore to avoid spurious menu accels. + */ +gchar * +vinagre_utils_escape_underscores (const gchar* text, + gssize length) +{ + GString *str; + const gchar *p; + const gchar *end; + + g_return_val_if_fail (text != NULL, NULL); + + if (length < 0) + length = strlen (text); + + str = g_string_sized_new (length); + + p = text; + end = text + length; + + while (p != end) + { + const gchar *next; + next = g_utf8_next_char (p); + + switch (*p) + { + case '_': + g_string_append (str, "__"); + break; + default: + g_string_append_len (str, p, next - p); + break; + } + + p = next; + } + + return g_string_free (str, FALSE); +} + +static void _default_log (const gchar *log_domain G_GNUC_UNUSED, + GLogLevelFlags log_level G_GNUC_UNUSED, + const gchar *message, + gpointer user_data G_GNUC_UNUSED) +{ + printf ("gtk-vnc: %s\n", message); +} + +void +vinagre_utils_handle_debug (void) +{ + static gboolean initialized = FALSE; + + if (initialized) + return; + + g_log_set_handler ("gtk-vnc", + G_LOG_LEVEL_DEBUG, + _default_log, + NULL); + + initialized = TRUE; +} + +/* the following two functions are courtesy of galeon */ + +/** + * gedit_utils_get_current_workspace: Get the current workspace + * + * Get the currently visible workspace for the #GdkScreen. + * + * If the X11 window property isn't found, 0 (the first workspace) + * is returned. + */ +guint +vinagre_utils_get_current_workspace (GdkScreen *screen) +{ +#ifdef GDK_WINDOWING_X11 + GdkWindow *root_win; + GdkDisplay *display; + Atom type; + gint format; + gulong nitems; + gulong bytes_after; + guint *current_desktop; + gint err, result; + guint ret = 0; + + g_return_val_if_fail (GDK_IS_SCREEN (screen), 0); + + root_win = gdk_screen_get_root_window (screen); + display = gdk_screen_get_display (screen); + + gdk_error_trap_push (); + result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win), + gdk_x11_get_xatom_by_name_for_display (display, "_NET_CURRENT_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, + &bytes_after, (gpointer) ¤t_desktop); + err = gdk_error_trap_pop (); + + if (err != Success || result != Success) + return ret; + + if (type == XA_CARDINAL && format == 32 && nitems > 0) + ret = current_desktop[0]; + + XFree (current_desktop); + return ret; +#else + /* FIXME: on mac etc proably there are native APIs + * to get the current workspace etc */ + return 0; +#endif +} + +/** + * gedit_utils_get_window_workspace: Get the workspace the window is on + * + * This function gets the workspace that the #GtkWindow is visible on, + * it returns GEDIT_ALL_WORKSPACES if the window is sticky, or if + * the window manager doesn support this function + */ +guint +vinagre_utils_get_window_workspace (GtkWindow *gtkwindow) +{ +#ifdef GDK_WINDOWING_X11 + GdkWindow *window; + GdkDisplay *display; + Atom type; + gint format; + gulong nitems; + gulong bytes_after; + guint *workspace; + gint err, result; + guint ret = VINAGRE_ALL_WORKSPACES; + + g_return_val_if_fail (GTK_IS_WINDOW (gtkwindow), 0); + g_return_val_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (gtkwindow)), 0); + + window = GTK_WIDGET (gtkwindow)->window; + display = gdk_drawable_get_display (window); + + gdk_error_trap_push (); + result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window), + gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, + &bytes_after, (gpointer) &workspace); + err = gdk_error_trap_pop (); + + if (err != Success || result != Success) + return ret; + + if (type == XA_CARDINAL && format == 32 && nitems > 0) + ret = workspace[0]; + + XFree (workspace); + return ret; +#else + /* FIXME: on mac etc proably there are native APIs + * to get the current workspace etc */ + return 0; +#endif +} + +/** + * gedit_utils_get_current_viewport: Get the current viewport origin + * + * Get the currently visible viewport origin for the #GdkScreen. + * + * If the X11 window property isn't found, (0, 0) is returned. + */ +void +vinagre_utils_get_current_viewport (GdkScreen *screen, + gint *x, + gint *y) +{ +#ifdef GDK_WINDOWING_X11 + GdkWindow *root_win; + GdkDisplay *display; + Atom type; + gint format; + gulong nitems; + gulong bytes_after; + gulong *coordinates; + gint err, result; + + g_return_if_fail (GDK_IS_SCREEN (screen)); + g_return_if_fail (x != NULL && y != NULL); + + /* Default values for the viewport origin */ + *x = 0; + *y = 0; + + root_win = gdk_screen_get_root_window (screen); + display = gdk_screen_get_display (screen); + + gdk_error_trap_push (); + result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win), + gdk_x11_get_xatom_by_name_for_display (display, "_NET_DESKTOP_VIEWPORT"), + 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, + &bytes_after, (void*) &coordinates); + err = gdk_error_trap_pop (); + + if (err != Success || result != Success) + return; + + if (type != XA_CARDINAL || format != 32 || nitems < 2) + { + XFree (coordinates); + return; + } + + *x = coordinates[0]; + *y = coordinates[1]; + XFree (coordinates); +#else + /* FIXME: on mac etc proably there are native APIs + * to get the current workspace etc */ + *x = 0; + *y = 0; +#endif +} + +/* Make url in about dialog clickable */ +static void +vinagre_about_dialog_handle_url (GtkAboutDialog *about, + const char *link, + gpointer data) +{ + GError *error = NULL; + gchar *address; + GdkScreen *screen; + + if (g_strstr_len (link, strlen (link), "@")) + address = g_strdup_printf ("mailto:%s", link); + else + address = g_strdup (link); + + screen = GTK_IS_WINDOW (data) ? gtk_window_get_screen (GTK_WINDOW (data)) : NULL; + + gtk_show_uri (screen, + address, + GDK_CURRENT_TIME, + &error); + + if (error != NULL) + { + vinagre_utils_show_error (NULL, error->message, GTK_IS_WINDOW (data) ? GTK_WINDOW (data) : NULL); + g_error_free (error); + } + + g_free (address); +} + +void +vinagre_utils_help_contents (GtkWindow *window) +{ + GError *error; + GdkScreen *screen; + + screen = GTK_IS_WINDOW (window) ? gtk_window_get_screen (GTK_WINDOW (window)) : NULL; + error = NULL; + + gtk_show_uri (screen, + "ghelp:vinagre", + GDK_CURRENT_TIME, + &error); + + if (error != NULL) + { + vinagre_utils_show_error (NULL, error->message, GTK_IS_WINDOW (window) ? window : NULL); + g_error_free (error); + } +} + +void +vinagre_utils_help_about (GtkWindow *window) +{ + static const gchar * const authors[] = { + "Jonh Wendell ", + NULL + }; + + static const gchar * const artists[] = { + "Vinicius Depizzol ", + NULL + }; + + static const gchar copyright[] = \ + "Copyright \xc2\xa9 2007-2009 Jonh Wendell"; + + static const gchar comments[] = \ + N_("Vinagre is a remote desktop viewer for the GNOME Desktop"); + + static const char *license[] = { + N_("Vinagre 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."), + N_("Vinagre 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."), + N_("You should have received a copy of the GNU General Public License " + "along with this program. If not, see .") + }; + + gchar *license_trans; + + license_trans = g_strjoin ("\n\n", _(license[0]), _(license[1]), + _(license[2]), NULL); + + /* Make URLs and email clickable in about dialog */ + gtk_about_dialog_set_url_hook (vinagre_about_dialog_handle_url, window, NULL); + gtk_about_dialog_set_email_hook (vinagre_about_dialog_handle_url, window, NULL); + + + gtk_show_about_dialog (GTK_IS_WINDOW (window)?window:NULL, + "authors", authors, + "artists", artists, + "comments", _(comments), + "copyright", copyright, + "license", license_trans, + "wrap-license", TRUE, + "logo-icon-name", "vinagre", + "translator-credits", _("translator-credits"), + "version", VERSION, + "website", "http://projects.gnome.org/vinagre/", + "website-label", _("Vinagre Website"), + NULL); + g_free (license_trans); +} + +gboolean +vinagre_utils_parse_boolean (const gchar* value) +{ + if (g_ascii_strcasecmp (value, "true") == 0 || strcmp (value, "1") == 0) + return TRUE; + + return FALSE; +} + +GtkWidget * +vinagre_gtk_button_new_with_stock_icon (const gchar *label, + const gchar *stock_id) +{ + GtkWidget *button; + + button = gtk_button_new_with_mnemonic (label); + gtk_button_set_image (GTK_BUTTON (button), + gtk_image_new_from_stock (stock_id, + GTK_ICON_SIZE_BUTTON)); + + return button; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-utils.h vinagre-2.29.1/vinagre/vinagre-utils.h --- vinagre-2.26.1/vinagre/vinagre-utils.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-utils.h 2009-10-24 13:56:52.000000000 +0100 @@ -0,0 +1,70 @@ +/* + * vinagre-utils.h + * This file is part of vinagre + * + * Copyright (C) 2007,2008 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_UTILS_H__ +#define __VINAGRE_UTILS_H__ + +#include +#include +#include "vinagre-plugin.h" + +/* useful macro */ +#define GBOOLEAN_TO_POINTER(i) ((gpointer) ((i) ? 2 : 1)) +#define GPOINTER_TO_BOOLEAN(i) ((gboolean) ((((gint)(i)) == 2) ? TRUE : FALSE)) +#define IS_VALID_BOOLEAN(v) (((v == TRUE) || (v == FALSE)) ? TRUE : FALSE) + +enum { VINAGRE_ALL_WORKSPACES = 0xffffffff }; + +GtkWidget *vinagre_utils_create_small_close_button (void); + +void vinagre_utils_show_error (const gchar *title, + const gchar *message, + GtkWindow *parent); + +void vinagre_utils_show_many_errors (const gchar *title, + GSList *items, + GtkWindow *parent); + +void vinagre_utils_toggle_widget_visible (GtkWidget *widget); + +const gchar *vinagre_utils_get_ui_filename (void); +const gchar *vinagre_utils_get_ui_xml_filename (void); +GtkBuilder *vinagre_utils_get_builder (VinagrePlugin *plugin, const gchar *filename); + +gchar *vinagre_utils_escape_underscores (const gchar *text, + gssize length); + +void vinagre_utils_handle_debug (void); + +guint vinagre_utils_get_current_workspace (GdkScreen *screen); +guint vinagre_utils_get_window_workspace (GtkWindow *gtkwindow); +void vinagre_utils_get_current_viewport (GdkScreen *screen, + gint *x, + gint *y); + +void vinagre_utils_help_contents (GtkWindow *window); +void vinagre_utils_help_about (GtkWindow *window); + +gboolean vinagre_utils_parse_boolean (const gchar* value); + +GtkWidget *vinagre_gtk_button_new_with_stock_icon (const gchar *label, + const gchar *stock_id); +#endif /* __VINAGRE_UTILS_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-window.c vinagre-2.29.1/vinagre/vinagre-window.c --- vinagre-2.26.1/vinagre/vinagre-window.c 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-window.c 2009-10-26 11:58:07.000000000 +0000 @@ -0,0 +1,977 @@ +/* + * vinagre-window.c + * This file is part of vinagre + * + * Copyright (C) 2007,2008,2009 - Jonh Wendell + * + * This program 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. + * + * This program 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include +#include + +#include "vinagre-window.h" +#include "vinagre-notebook.h" +#include "vinagre-fav.h" +#include "vinagre-prefs.h" +#include "vinagre-utils.h" +#include "vinagre-bookmarks.h" +#include "vinagre-ui.h" +#include "vinagre-window-private.h" +#include "vinagre-bookmarks-entry.h" +#include "vinagre-plugin.h" +#include "vinagre-plugins-engine.h" + +#ifdef VINAGRE_ENABLE_AVAHI +#include "vinagre-mdns.h" +#endif + +#define VINAGRE_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\ + VINAGRE_TYPE_WINDOW, \ + VinagreWindowPrivate)) + +G_DEFINE_TYPE(VinagreWindow, vinagre_window, GTK_TYPE_WINDOW) + +static void +vinagre_window_dispose (GObject *object) +{ + VinagreWindow *window = VINAGRE_WINDOW (object); + + if (!window->priv->dispose_has_run) + { + vinagre_plugins_engine_deactivate_plugins (vinagre_plugins_engine_get_default (), + window); + window->priv->dispose_has_run = TRUE; + } + + if (window->priv->manager) + { + g_object_unref (window->priv->manager); + window->priv->manager = NULL; + } + + if (window->priv->update_recents_menu_ui_id != 0) + { + GtkRecentManager *recent_manager = gtk_recent_manager_get_default (); + + g_signal_handler_disconnect (recent_manager, + window->priv->update_recents_menu_ui_id); + window->priv->update_recents_menu_ui_id = 0; + } + + G_OBJECT_CLASS (vinagre_window_parent_class)->dispose (object); +} + +static gboolean +vinagre_window_delete_event (GtkWidget *widget, + GdkEventAny *event) +{ + VinagreWindow *window = VINAGRE_WINDOW (widget); + + vinagre_window_close_all_tabs (window); + + if (GTK_WIDGET_CLASS (vinagre_window_parent_class)->delete_event) + return GTK_WIDGET_CLASS (vinagre_window_parent_class)->delete_event (widget, event); + else + return FALSE; +} + +static void +vinagre_window_show_hide_controls (VinagreWindow *window) +{ + if (window->priv->fullscreen) + { + window->priv->fav_panel_visible = GTK_WIDGET_VISIBLE (window->priv->fav_panel); + gtk_widget_hide (window->priv->fav_panel); + + window->priv->toolbar_visible = GTK_WIDGET_VISIBLE (window->priv->toolbar); + gtk_widget_hide (window->priv->toolbar); + + gtk_widget_hide (window->priv->menubar); + + window->priv->statusbar_visible = GTK_WIDGET_VISIBLE (window->priv->statusbar); + gtk_widget_hide (window->priv->statusbar); + + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->priv->notebook), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (window->priv->notebook), FALSE); + } + else + { + if (window->priv->fav_panel_visible) + gtk_widget_show_all (window->priv->fav_panel); + + if (window->priv->toolbar_visible) + gtk_widget_show_all (window->priv->toolbar); + + gtk_widget_show_all (window->priv->menubar); + + if (window->priv->statusbar_visible) + gtk_widget_show_all (window->priv->statusbar); + + vinagre_notebook_show_hide_tabs (VINAGRE_NOTEBOOK (window->priv->notebook)); + gtk_notebook_set_show_border (GTK_NOTEBOOK (window->priv->notebook), TRUE); + } +} + +static gboolean +vinagre_window_state_event_cb (GtkWidget *widget, + GdkEventWindowState *event) +{ + VinagreWindow *window = VINAGRE_WINDOW (widget); + + window->priv->window_state = event->new_window_state; + g_object_set (vinagre_prefs_get_default (), + "window-state", window->priv->window_state, + NULL); + + if ((event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) == 0) + return FALSE; + + if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) + window->priv->fullscreen = TRUE; + else + window->priv->fullscreen = FALSE; + + vinagre_window_show_hide_controls (window); + + if (GTK_WIDGET_CLASS (vinagre_window_parent_class)->window_state_event) + return GTK_WIDGET_CLASS (vinagre_window_parent_class)->window_state_event (widget, event); + else + return FALSE; +} + +static gboolean +vinagre_window_configure_event (GtkWidget *widget, + GdkEventConfigure *event) +{ + VinagreWindow *window = VINAGRE_WINDOW (widget); + + window->priv->width = event->width; + window->priv->height = event->height; + + g_object_set (vinagre_prefs_get_default (), + "window-width", window->priv->width, + "window-height", window->priv->height, + NULL); + + return GTK_WIDGET_CLASS (vinagre_window_parent_class)->configure_event (widget, event); +} + +static void +vinagre_window_class_init (VinagreWindowClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + object_class->dispose = vinagre_window_dispose; + + widget_class->window_state_event = vinagre_window_state_event_cb; + widget_class->configure_event = vinagre_window_configure_event; + widget_class->delete_event = vinagre_window_delete_event; + + g_type_class_add_private (object_class, sizeof(VinagreWindowPrivate)); +} + +static void +menu_item_select_cb (GtkItem *proxy, + VinagreWindow *window) +{ + GtkAction *action; + char *message; + + action = g_object_get_data (G_OBJECT (proxy), "gtk-action"); + g_return_if_fail (action != NULL); + + g_object_get (G_OBJECT (action), "tooltip", &message, NULL); + if (message) + { + gtk_statusbar_push (GTK_STATUSBAR (window->priv->statusbar), + window->priv->tip_message_cid, message); + g_free (message); + } +} + +static void +menu_item_deselect_cb (GtkItem *proxy, + VinagreWindow *window) +{ + gtk_statusbar_pop (GTK_STATUSBAR (window->priv->statusbar), + window->priv->tip_message_cid); +} + +static void +connect_proxy_cb (GtkUIManager *manager, + GtkAction *action, + GtkWidget *proxy, + VinagreWindow *window) +{ + if (GTK_IS_MENU_ITEM (proxy)) + { + g_signal_connect (proxy, "select", + G_CALLBACK (menu_item_select_cb), window); + g_signal_connect (proxy, "deselect", + G_CALLBACK (menu_item_deselect_cb), window); + } +} + +static void +disconnect_proxy_cb (GtkUIManager *manager, + GtkAction *action, + GtkWidget *proxy, + VinagreWindow *window) +{ + if (GTK_IS_MENU_ITEM (proxy)) + { + g_signal_handlers_disconnect_by_func + (proxy, G_CALLBACK (menu_item_select_cb), window); + g_signal_handlers_disconnect_by_func + (proxy, G_CALLBACK (menu_item_deselect_cb), window); + } +} + +static void +activate_recent_cb (GtkRecentChooser *action, VinagreWindow *window) +{ + VinagreConnection *conn; + gchar *error, *uri; + + uri = gtk_recent_chooser_get_current_uri (action); + conn = vinagre_connection_new_from_string (uri, + &error, + TRUE); + if (conn) + { + vinagre_cmd_open_bookmark (window, conn); + g_object_unref (conn); + } + else + vinagre_utils_show_error (NULL, error ? error : _("Unknown error"), GTK_WINDOW (window)); + + g_free (error); + g_free (uri); +} + +static void +update_recent_connections (VinagreWindow *window) +{ + VinagreWindowPrivate *p = window->priv; + + g_return_if_fail (p->recent_action_group != NULL); + + if (p->recents_menu_ui_id != 0) + gtk_ui_manager_remove_ui (p->manager, p->recents_menu_ui_id); + + p->recents_menu_ui_id = gtk_ui_manager_new_merge_id (p->manager); + + gtk_ui_manager_add_ui (p->manager, + p->recents_menu_ui_id, + "/MenuBar/MachineMenu/FileRecentsPlaceholder", + "recent_connections", + "recent_connections", + GTK_UI_MANAGER_MENUITEM, + FALSE); +} + +static void +recent_manager_changed (GtkRecentManager *manager, + VinagreWindow *window) +{ + update_recent_connections (window); +} + +static void +show_hide_accels (VinagreWindow *window) +{ + gboolean show_accels; + + g_object_get (vinagre_prefs_get_default (), + "show-accels", &show_accels, + NULL); + g_object_set (gtk_settings_get_default (), + "gtk-enable-accels", show_accels, + "gtk-enable-mnemonics", show_accels, + NULL); +} + +static void +create_menu_bar_and_toolbar (VinagreWindow *window, + GtkWidget *main_box) +{ + GtkActionGroup *action_group; + GtkUIManager *manager; + GError *error = NULL; + GtkRecentManager *recent_manager; + GtkRecentFilter *filter; + GtkAction *action; + + manager = gtk_ui_manager_new (); + window->priv->manager = manager; + + /* show tooltips in the statusbar */ + g_signal_connect (manager, + "connect-proxy", + G_CALLBACK (connect_proxy_cb), + window); + g_signal_connect (manager, + "disconnect-proxy", + G_CALLBACK (disconnect_proxy_cb), + window); + + gtk_window_add_accel_group (GTK_WINDOW (window), + gtk_ui_manager_get_accel_group (manager)); + + /* Normal actions */ + action_group = gtk_action_group_new ("VinagreWindowAlwaysSensitiveActions"); + gtk_action_group_set_translation_domain (action_group, NULL); + gtk_action_group_add_actions (action_group, + vinagre_always_sensitive_entries, + G_N_ELEMENTS (vinagre_always_sensitive_entries), + window); + + gtk_action_group_add_toggle_actions (action_group, + vinagre_always_sensitive_toggle_entries, + G_N_ELEMENTS (vinagre_always_sensitive_toggle_entries), + window); + + gtk_ui_manager_insert_action_group (manager, action_group, 0); + g_object_unref (action_group); + window->priv->always_sensitive_action_group = action_group; + + action = gtk_action_group_get_action (action_group, "MachineConnect"); + g_object_set (action, "is_important", TRUE, NULL); + + /* Machine connected actions */ + action_group = gtk_action_group_new ("VinagreWindowMachineConnectedActions"); + gtk_action_group_set_translation_domain (action_group, NULL); + gtk_action_group_add_actions (action_group, + vinagre_machine_connected_entries, + G_N_ELEMENTS (vinagre_machine_connected_entries), + window); + gtk_action_group_set_sensitive (action_group, FALSE); + gtk_ui_manager_insert_action_group (manager, action_group, 0); + g_object_unref (action_group); + window->priv->machine_connected_action_group = action_group; + + action = gtk_action_group_get_action (action_group, "MachineClose"); + g_object_set (action, "is_important", TRUE, NULL); + + /* Machine initialized actions */ + action_group = gtk_action_group_new ("VinagreWindowMachineInitializedActions"); + gtk_action_group_set_translation_domain (action_group, NULL); + gtk_action_group_add_actions (action_group, + vinagre_machine_initialized_entries, + G_N_ELEMENTS (vinagre_machine_initialized_entries), + window); + gtk_action_group_set_sensitive (action_group, FALSE); + gtk_ui_manager_insert_action_group (manager, action_group, 0); + g_object_unref (action_group); + window->priv->machine_initialized_action_group = action_group; + + action = gtk_action_group_get_action (action_group, "ViewFullScreen"); + g_object_set (action, "is_important", TRUE, NULL); + action = gtk_action_group_get_action (action_group, "MachineTakeScreenshot"); + g_object_set (action, "is_important", TRUE, NULL); + + /* now load the UI definition */ + gtk_ui_manager_add_ui_from_file (manager, vinagre_utils_get_ui_xml_filename (), &error); + if (error != NULL) + { + g_critical (_("Could not merge UI XML file: %s"), error->message); + g_error_free (error); + return; + } + + /* Bookmarks */ + action_group = gtk_action_group_new ("BookmarksActions"); + gtk_action_group_set_translation_domain (action_group, NULL); + window->priv->bookmarks_list_action_group = action_group; + gtk_ui_manager_insert_action_group (manager, action_group, 0); + g_object_unref (action_group); + + window->priv->menubar = gtk_ui_manager_get_widget (manager, "/MenuBar"); + gtk_box_pack_start (GTK_BOX (main_box), + window->priv->menubar, + FALSE, + FALSE, + 0); + + window->priv->toolbar = gtk_ui_manager_get_widget (manager, "/ToolBar"); + gtk_widget_hide (window->priv->toolbar); + gtk_box_pack_start (GTK_BOX (main_box), + window->priv->toolbar, + FALSE, + FALSE, + 0); + + /* Recent connections */ + window->priv->recent_action = gtk_recent_action_new ("recent_connections", + _("_Recent connections"), + NULL, NULL); + g_object_set (G_OBJECT (window->priv->recent_action), + "show-not-found", TRUE, + "local-only", FALSE, + "show-private", TRUE, + "show-tips", TRUE, + "sort-type", GTK_RECENT_SORT_MRU, + NULL); + g_signal_connect (window->priv->recent_action, + "item-activated", + G_CALLBACK (activate_recent_cb), + window); + + action_group = gtk_action_group_new ("VinagreRecentConnectionsActions"); + gtk_action_group_set_translation_domain (action_group, NULL); + + gtk_ui_manager_insert_action_group (manager, action_group, 0); + g_object_unref (action_group); + window->priv->recent_action_group = action_group; + gtk_action_group_add_action (window->priv->recent_action_group, + window->priv->recent_action); + + filter = gtk_recent_filter_new (); + gtk_recent_filter_add_group (filter, "vinagre"); + gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (window->priv->recent_action), + filter); + + update_recent_connections (window); + + recent_manager = gtk_recent_manager_get_default (); + window->priv->update_recents_menu_ui_id = g_signal_connect ( + recent_manager, + "changed", + G_CALLBACK (recent_manager_changed), + window); + + g_signal_connect_swapped (vinagre_prefs_get_default (), + "notify::show-accels", + G_CALLBACK (show_hide_accels), + window); + show_hide_accels (window); +} + +static void +fav_panel_size_allocate (GtkWidget *widget, + GtkAllocation *allocation, + VinagreWindow *window) +{ + window->priv->side_panel_size = allocation->width; + if (window->priv->side_panel_size > 0) + g_object_set (vinagre_prefs_get_default (), + "side-panel-size", window->priv->side_panel_size, + NULL); +} + +static void +vinagre_window_populate_bookmarks (VinagreWindow *window, + const gchar *group, + GSList *entries, + const gchar *parent) +{ + static guint i = 0; + GSList *l; + VinagreBookmarksEntry *entry; + gchar *action_name, *action_label, *path, *tooltip; + GtkAction *action; + VinagreWindowPrivate *p = window->priv; + VinagreConnection *conn; + VinagrePlugin *plugin; + + for (l = entries; l; l = l->next) + { + entry = VINAGRE_BOOKMARKS_ENTRY (l->data); + switch (vinagre_bookmarks_entry_get_node (entry)) + { + case VINAGRE_BOOKMARKS_ENTRY_NODE_FOLDER: + action_label = vinagre_utils_escape_underscores (vinagre_bookmarks_entry_get_name (entry), -1); + action_name = g_strdup_printf ("BOOKMARK_FOLDER_ACTION_%d", ++i); + action = gtk_action_new (action_name, + action_label, + NULL, + NULL); + g_object_set (G_OBJECT (action), "icon-name", "folder", "hide-if-empty", FALSE, NULL); + gtk_action_group_add_action (p->bookmarks_list_action_group, + action); + g_object_unref (action); + + path = g_strdup_printf ("/MenuBar/BookmarksMenu/%s%s", group, parent?parent:""); + gtk_ui_manager_add_ui (p->manager, + p->bookmarks_list_menu_ui_id, + path, + action_label, action_name, + GTK_UI_MANAGER_MENU, + FALSE); + g_free (path); + g_free (action_name); + + path = g_strdup_printf ("%s/%s", parent?parent:"", action_label); + g_free (action_label); + + vinagre_window_populate_bookmarks (window, group, vinagre_bookmarks_entry_get_children (entry), path); + g_free (path); + break; + + case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN: + conn = vinagre_bookmarks_entry_get_conn (entry); + plugin = vinagre_plugins_engine_get_plugin_by_protocol (vinagre_plugins_engine_get_default (), + vinagre_connection_get_protocol (conn)); + + action_name = vinagre_connection_get_best_name (conn); + action_label = vinagre_utils_escape_underscores (action_name, -1); + g_free (action_name); + + action_name = g_strdup_printf ("BOOKMARK_ITEM_ACTION_%d", ++i); + + /* Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu */ + tooltip = g_strdup_printf (_("Open %s:%d"), + vinagre_connection_get_host (conn), + vinagre_connection_get_port (conn)); + action = gtk_action_new (action_name, + action_label, + tooltip, + NULL); + g_object_set (G_OBJECT (action), + "icon-name", + vinagre_plugin_get_icon_name (plugin), + NULL); + g_object_set_data (G_OBJECT (action), "conn", conn); + gtk_action_group_add_action (p->bookmarks_list_action_group, + action); + g_signal_connect (action, + "activate", + G_CALLBACK (vinagre_fav_bookmarks_open), + window->priv->fav_panel); + + path = g_strdup_printf ("/MenuBar/BookmarksMenu/%s%s", group, parent?parent:""); + gtk_ui_manager_add_ui (p->manager, + p->bookmarks_list_menu_ui_id, + path, + action_label, action_name, + GTK_UI_MANAGER_MENUITEM, + FALSE); + + g_object_unref (action); + g_free (action_name); + g_free (action_label); + g_free (tooltip); + g_free (path); + break; + + default: + g_assert_not_reached (); + } + } +} + +void +vinagre_window_update_bookmarks_list_menu (VinagreWindow *window) +{ + VinagreWindowPrivate *p = window->priv; + GList *actions, *l; + GSList *favs, *mdnss = NULL; + + g_return_if_fail (p->bookmarks_list_action_group != NULL); + + if (p->bookmarks_list_menu_ui_id != 0) + gtk_ui_manager_remove_ui (p->manager, p->bookmarks_list_menu_ui_id); + + actions = gtk_action_group_list_actions (p->bookmarks_list_action_group); + for (l = actions; l != NULL; l = l->next) + { + g_signal_handlers_disconnect_by_func (GTK_ACTION (l->data), + G_CALLBACK (vinagre_fav_bookmarks_open), + window->priv->fav_panel); + gtk_action_group_remove_action (p->bookmarks_list_action_group, + GTK_ACTION (l->data)); + } + g_list_free (actions); + + favs = vinagre_bookmarks_get_all (vinagre_bookmarks_get_default ()); + +#ifdef VINAGRE_ENABLE_AVAHI + mdnss = vinagre_mdns_get_all (vinagre_mdns_get_default ()); +#endif + + p->bookmarks_list_menu_ui_id = (g_slist_length (favs) > 0||g_slist_length (mdnss) > 0) ? gtk_ui_manager_new_merge_id (p->manager) : 0; + vinagre_window_populate_bookmarks (window, "BookmarksList", favs, NULL); + vinagre_window_populate_bookmarks (window, "AvahiList", mdnss, NULL); +} + +static void +create_side_panel (VinagreWindow *window) +{ + window->priv->fav_panel = vinagre_fav_new (window); + + gtk_paned_pack1 (GTK_PANED (window->priv->hpaned), + window->priv->fav_panel, + FALSE, + FALSE); + + g_object_get (vinagre_prefs_get_default (), + "side-panel-size", &(window->priv->side_panel_size), + NULL); + gtk_paned_set_position (GTK_PANED (window->priv->hpaned), window->priv->side_panel_size); + + g_signal_connect (window->priv->fav_panel, + "size-allocate", + G_CALLBACK (fav_panel_size_allocate), + window); +} + +static void +init_widgets_visibility (VinagreWindow *window) +{ + GdkWindowState state; + gint w, h; + GtkAction *action; + gboolean visible; + VinagrePrefs *prefs = vinagre_prefs_get_default (); + + /* side panel visibility */ + action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, + "ViewSidePanel"); + g_object_get (prefs, "side-panel-visible", &visible, NULL); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + + /* toolbar visibility */ + action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, + "ViewToolbar"); + g_object_get (prefs, "toolbar-visible", &visible, NULL); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + + /* statusbar visibility */ + action = gtk_action_group_get_action (window->priv->always_sensitive_action_group, + "ViewStatusbar"); + g_object_get (prefs, "statusbar-visible", &visible, NULL); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) != visible) + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible); + + g_object_get (prefs, + "window-state", &state, + "window-width", &w, + "window-height", &h, + NULL); + + gtk_window_set_default_size (GTK_WINDOW (window), w, h); + + if ((state & GDK_WINDOW_STATE_MAXIMIZED) != 0) + gtk_window_maximize (GTK_WINDOW (window)); + else + gtk_window_unmaximize (GTK_WINDOW (window)); +} + +static void +create_statusbar (VinagreWindow *window, + GtkWidget *main_box) +{ + window->priv->statusbar = gtk_statusbar_new (); + + window->priv->generic_message_cid = gtk_statusbar_get_context_id + (GTK_STATUSBAR (window->priv->statusbar), "generic_message"); + window->priv->tip_message_cid = gtk_statusbar_get_context_id + (GTK_STATUSBAR (window->priv->statusbar), "tip_message"); + + gtk_box_pack_end (GTK_BOX (main_box), + window->priv->statusbar, + FALSE, + TRUE, + 0); +} + +static void +create_notebook (VinagreWindow *window) +{ + window->priv->notebook = vinagre_notebook_new (window); + + gtk_paned_pack2 (GTK_PANED (window->priv->hpaned), + GTK_WIDGET (window->priv->notebook), + TRUE, + FALSE); + + gtk_widget_show (GTK_WIDGET (window->priv->notebook)); +} + +static void +vinagre_window_init (VinagreWindow *window) +{ + GtkWidget *main_box; + + gtk_window_set_default_icon_name ("vinagre"); + + window->priv = VINAGRE_WINDOW_GET_PRIVATE (window); + window->priv->fullscreen = FALSE; + window->priv->dispose_has_run = FALSE; + + main_box = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (window), main_box); + gtk_widget_show (main_box); + + /* Add menu bar and toolbar bar */ + create_menu_bar_and_toolbar (window, main_box); + + /* Add status bar */ + create_statusbar (window, main_box); + + /* Add the main area */ + window->priv->hpaned = gtk_hpaned_new (); + gtk_box_pack_start (GTK_BOX (main_box), + window->priv->hpaned, + TRUE, + TRUE, + 0); + + /* setup notebook area */ + create_notebook (window); + + /* side panel */ + create_side_panel (window); + + gtk_widget_show (window->priv->hpaned); + + gtk_widget_grab_focus (window->priv->hpaned); + + init_widgets_visibility (window); +// vinagre_window_merge_tab_ui (window); + + vinagre_window_update_bookmarks_list_menu (window); + g_signal_connect_swapped (vinagre_bookmarks_get_default (), + "changed", + G_CALLBACK (vinagre_window_update_bookmarks_list_menu), + window); +#ifdef VINAGRE_ENABLE_AVAHI + g_signal_connect_swapped (vinagre_mdns_get_default (), + "changed", + G_CALLBACK (vinagre_window_update_bookmarks_list_menu), + window); +#endif + + vinagre_plugins_engine_activate_plugins (vinagre_plugins_engine_get_default (), + window); + +} + +VinagreNotebook * +vinagre_window_get_notebook (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return window->priv->notebook; +} + +void +vinagre_window_close_all_tabs (VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + vinagre_notebook_close_all_tabs (VINAGRE_NOTEBOOK (window->priv->notebook)); +} + +void +vinagre_window_set_active_tab (VinagreWindow *window, + VinagreTab *tab) +{ + gint page_num; + + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + g_return_if_fail (VINAGRE_IS_TAB (tab)); + + page_num = gtk_notebook_page_num (GTK_NOTEBOOK (window->priv->notebook), + GTK_WIDGET (tab)); + g_return_if_fail (page_num != -1); + + gtk_notebook_set_current_page (GTK_NOTEBOOK (window->priv->notebook), + page_num); +} + +VinagreWindow * +vinagre_window_new () +{ + return g_object_new (VINAGRE_TYPE_WINDOW, + "type", GTK_WINDOW_TOPLEVEL, + "title", g_get_application_name (), + NULL); +} + +gboolean +vinagre_window_is_fullscreen (VinagreWindow *window) +{ + return window->priv->fullscreen; +} + +void +vinagre_window_toggle_fullscreen (VinagreWindow *window) +{ + if (window->priv->fullscreen) + gtk_window_unfullscreen (GTK_WINDOW (window)); + else + gtk_window_fullscreen (GTK_WINDOW (window)); +} + +GtkWidget * +vinagre_window_get_statusbar (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return window->priv->statusbar; +} + +GtkWidget * +vinagre_window_get_toolbar (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return window->priv->toolbar; +} + +GtkWidget * +vinagre_window_get_menubar (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return window->priv->menubar; +} + +GtkActionGroup * +vinagre_window_get_initialized_action (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return window->priv->machine_initialized_action_group; +} + +GtkActionGroup * +vinagre_window_get_always_sensitive_action (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return window->priv->always_sensitive_action_group; +} + +GtkActionGroup * +vinagre_window_get_connected_action (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return window->priv->machine_connected_action_group; +} + +GtkWidget * +vinagre_window_get_fav_panel (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return window->priv->fav_panel; +} + +void +vinagre_window_close_active_tab (VinagreWindow *window) +{ + g_return_if_fail (VINAGRE_IS_WINDOW (window)); + + vinagre_notebook_close_active_tab (window->priv->notebook); +} + +VinagreTab * +vinagre_window_get_active_tab (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return vinagre_notebook_get_active_tab (window->priv->notebook); +} + +GtkUIManager * +vinagre_window_get_ui_manager (VinagreWindow *window) +{ + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + return window->priv->manager; +} + +static void +add_connection (VinagreTab *tab, GList **res) +{ + VinagreConnection *conn; + + conn = vinagre_tab_get_conn (tab); + + *res = g_list_prepend (*res, conn); +} + +/* Returns a newly allocated list with all the connections in the window */ +GList * +vinagre_window_get_connections (VinagreWindow *window) +{ + GList *res = NULL; + + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + + gtk_container_foreach (GTK_CONTAINER (window->priv->notebook), + (GtkCallback)add_connection, + &res); + + res = g_list_reverse (res); + + return res; +} + +VinagreTab * +vinagre_window_conn_exists (VinagreWindow *window, VinagreConnection *conn) +{ + VinagreConnection *c; + VinagreTab *tab; + const gchar *host, *protocol; + gint port; + GList *l; + + g_return_val_if_fail (VINAGRE_IS_WINDOW (window), NULL); + g_return_val_if_fail (VINAGRE_IS_CONNECTION (conn), NULL); + + host = vinagre_connection_get_host (conn); + protocol = vinagre_connection_get_protocol (conn); + port = vinagre_connection_get_port (conn); + + if (!host || !protocol) + return NULL; + + l = vinagre_window_get_connections (window); + tab = NULL; + + while (l != NULL) + { + c = VINAGRE_CONNECTION (l->data); + + if (!strcmp (host, vinagre_connection_get_host (c)) && + !strcmp (protocol, vinagre_connection_get_protocol (c)) && + port == vinagre_connection_get_port (c)) + { + tab = g_object_get_data (G_OBJECT (c), VINAGRE_TAB_KEY); + break; + } + l = l->next; + } + g_list_free (l); + + return tab; +} + +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-window.h vinagre-2.29.1/vinagre/vinagre-window.h --- vinagre-2.26.1/vinagre/vinagre-window.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-window.h 2009-07-27 12:59:27.000000000 +0100 @@ -0,0 +1,98 @@ +/* + * vinagre-window.h + * This file is part of vinagre + * + * Copyright (C) 2007,2009 - Jonh Wendell + * + * This program 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANWINDOWILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_WINDOW_H__ +#define __VINAGRE_WINDOW_H__ + +#include + +G_BEGIN_DECLS + +#define VINAGRE_TYPE_WINDOW (vinagre_window_get_type()) +#define VINAGRE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_WINDOW, VinagreWindow)) +#define VINAGRE_WINDOW_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VINAGRE_TYPE_WINDOW, VinagreWindow const)) +#define VINAGRE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VINAGRE_TYPE_WINDOW, VinagreWindowClass)) +#define VINAGRE_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), VINAGRE_TYPE_WINDOW)) +#define VINAGRE_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VINAGRE_TYPE_WINDOW)) +#define VINAGRE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), VINAGRE_TYPE_WINDOW, VinagreWindowClass)) + +typedef struct _VinagreWindowPrivate VinagreWindowPrivate; +typedef struct _VinagreWindow VinagreWindow; +typedef struct _VinagreWindowClass VinagreWindowClass; + +#include "vinagre-tab.h" +#include "vinagre-bookmarks.h" + +struct _VinagreWindow +{ + GtkWindow window; + VinagreWindowPrivate *priv; +}; + +struct _VinagreWindowClass +{ + GtkWindowClass parent_class; +}; + +GType vinagre_window_get_type (void) G_GNUC_CONST; + +VinagreWindow *vinagre_window_new (void); + +void vinagre_window_close_tab (VinagreWindow *window, + VinagreTab *tab); +void vinagre_window_close_active_tab (VinagreWindow *window); + +void vinagre_window_close_all_tabs (VinagreWindow *window); + +void vinagre_window_close_tabs (VinagreWindow *window, + const GList *tabs); + +VinagreTab *vinagre_window_get_active_tab (VinagreWindow *window); + +void vinagre_window_set_active_tab (VinagreWindow *window, + VinagreTab *tab); + +GtkWidget *vinagre_window_get_statusbar (VinagreWindow *window); +GtkWidget *vinagre_window_get_toolbar (VinagreWindow *window); +GtkWidget *vinagre_window_get_menubar (VinagreWindow *window); +GtkWidget *vinagre_window_get_fav_panel (VinagreWindow *window); +VinagreNotebook *vinagre_window_get_notebook (VinagreWindow *window); +GtkActionGroup *vinagre_window_get_initialized_action (VinagreWindow *window); +GtkActionGroup *vinagre_window_get_always_sensitive_action (VinagreWindow *window); +GtkActionGroup *vinagre_window_get_connected_action (VinagreWindow *window); + +void vinagre_window_update_bookmarks_list_menu (VinagreWindow *window); + +GtkUIManager *vinagre_window_get_ui_manager (VinagreWindow *window); + +gboolean vinagre_window_is_fullscreen (VinagreWindow *window); + +void vinagre_window_toggle_fullscreen (VinagreWindow *window); + +void vinagre_window_merge_tab_ui (VinagreWindow *window); + +GList *vinagre_window_get_connections (VinagreWindow *window); +VinagreTab *vinagre_window_conn_exists (VinagreWindow *window, + VinagreConnection *conn); + +G_END_DECLS + +#endif /* __VINAGRE_WINDOW_H__ */ +/* vim: set ts=8: */ diff -Nru vinagre-2.26.1/vinagre/vinagre-window-private.h vinagre-2.29.1/vinagre/vinagre-window-private.h --- vinagre-2.26.1/vinagre/vinagre-window-private.h 1970-01-01 01:00:00.000000000 +0100 +++ vinagre-2.29.1/vinagre/vinagre-window-private.h 2009-10-24 22:31:27.000000000 +0100 @@ -0,0 +1,74 @@ +/* + * vinagre-window-private.h + * This file is part of vinagre + * + * Copyright (C) 2007,2008 - Jonh Wendell + * + * This program 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANWINDOWILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VINAGRE_WINDOW_PRIVATE_H__ +#define __VINAGRE_WINDOW_PRIVATE_H__ + +#include "vinagre-window.h" +#include "vinagre-notebook.h" + +G_BEGIN_DECLS + +/* WindowPrivate is in a separate .h so that we can access it from vinagre-commands */ + +struct _VinagreWindowPrivate +{ + VinagreNotebook *notebook; + GtkWidget *fav_panel; + GtkWidget *statusbar; + guint generic_message_cid; + guint tip_message_cid; + + GtkWidget *hpaned; + + /* Menus & Toolbars */ + GtkUIManager *manager; + + GtkActionGroup *always_sensitive_action_group; + GtkActionGroup *machine_connected_action_group; + GtkActionGroup *machine_initialized_action_group; + + GtkActionGroup *bookmarks_list_action_group; + GtkActionGroup *recent_action_group; + GtkAction *recent_action; + guint bookmarks_list_menu_ui_id; + guint recents_menu_ui_id; + guint update_recents_menu_ui_id; + + GtkWidget *toolbar; + GtkWidget *menubar; + + gint width; + gint height; + GdkWindowState window_state; + gint side_panel_size; + + gboolean fullscreen; + gboolean toolbar_visible; + gboolean statusbar_visible; + gboolean fav_panel_visible; + gboolean dispose_has_run; +}; + + +G_END_DECLS + +#endif /* __VINAGRE_WINDOW_PRIVATE_H__ */ +/* vim: set ts=8: */